Remove the ! from the org part

[acalatrava]

When generating an org token, the organisation part won't expect the org! form but only org. So we should remove the ! if present to avoid confusion.