Fix
Switch from rspec to test_unit
Merge branch 'master' into upgrade-to-4

Conflicts:
	app/controllers/oauths_controller.rb
	app/models/user.rb
	config/initializers/sorcery.rb
	config/routes.rb
	db/schema.rb