Merge pull request #2 from nealcpeters/image_migration

fixed dumbness
models and migrations
Merge branch 'master' into neal
Merge pull request #3 from nealcpeters/neal

Neal
model validations
Merge branch 'master' into neal
Merge pull request #4 from nealcpeters/neal

Neal
woot
Merge branch 'master' of https://github.com/nealcpeters/happiness into image_migration