Clean up create from google oauth
Merge pull request #300 from 18F/feature/google_oauth

Clean up create from google oauth
I18n.t for token sms message
Merge remote-tracking branch 'origin/devel' into feature/mobile_phone_confirmation

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb