gemfile update
migration update
Merge pull request #41 from blairprophett/master

db updates