Merge pull request #66 from craigspaeth/migrate

@craigspaeth: That's the upsert ticket!
Merge pull request #67 from craigspaeth/migrate

@craigspaeth: Random bugs
Merge branch 'master' of github.com:artsy/positron into migrate
bugs on bugs