Try to fix auth with a different gem
Block non-envato emails
Google GETs to our callback endpoint
Merge branch 'master' of heroku.com:envato-hilander

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/sessions_controller.rb
	config/initializers/omniauth.rb
	config/routes.rb
Don't call yourself call yourself call yourself...

Conflicts:
	app/models/user.rb
Merge branch 'master' of https://github.com/ejoubaud/highlander

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/sessions_controller.rb
	app/models/user.rb
	config/initializers/omniauth.rb
	config/routes.rb
Don't call yourself call yourself call yourself...
Merge branch 'master' of github.com:ejoubaud/highlander

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/omniauth.rb
	config/routes.rb
Merge branch 'fix-method-loop'
Fix the Gemfile
Merge branch 'master' into clans

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/initializers/omniauth.rb
	config/routes.rb