Codyedit for #440
Merge branch 'Littlefixes' of git://github.com/kcarcia/rSENSE into mergy

Conflicts:
	app/models/user.rb
Merge pull request #466 from mmcguinn/mergy

Merge for PR #463