Merge pull request #33 from SalamanderMike/master

users#show only allows changes to current_user
finished user validations
Merge pull request #34 from SalamanderMike/master

finished user validations
password reset setup
Merge branch 'master' of git://github.com/Siejen/2014WDI_SuperGrp into dev

group merge.