merged gemfile from 3.2
add migrations
Merge pull request #4 from sotoseattle/master

migrations