Cleaning up user class.

+ Pulled out logic into private methods.
Merge branch 'master' into specs

Conflicts:
	lib/scrum_yo/user.rb