Swap order of Google and Zendesk authentication options.
Correct line spacing at the end of omniauth file.

Applying coding convention fix from pull request.