Merge pull request #4 from nealcpeters/neal

Neal
woot
Merge branch 'master' of https://github.com/nealcpeters/happiness into image_migration
Merge pull request #5 from nealcpeters/image_migration

Image migration
controllers
validations
Merge branch 'master' into neal