Mailer setup
OmniAuth setup
Merge branch 'feature/oauth'

Conflicts:
	app/models/user.rb
	db/schema.rb