updates the generators
Merge remote-tracking branch 'origin' into hassox/generate

Conflicts:
	Gemfile.lock
	app/views/socialite/sessions/new.html.haml
	config/routes.rb
	lib/generators/socialite/install_generator.rb
	lib/socialite/models/user_concern.rb
	socialite.gemspec
Merge branch 'hassox/generate'