fixes and refactors a big bunch of stuff

I cleaned things up for you Allison. I really don't think you need to start again. You'll have to drop and recreate your database and rebundle for these changes.

```
git pull origin master
bundle install --without production
rake db:drop
rake db:setup
````