Added password resets and unfinished veryify email stuff
Merge branch 'master' of https://github.com/ryanklimt/TheRealDeal

Conflicts:
	app/models/user.rb