User ctrl refactor - breaks up large methods, moves some logic into model

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb

Includes missing methods from backup for travis to pass

Conflicts:
	app/models/user.rb

fix missing code, failing specs