Fixes migrations
Merge pull request #379 from mauler/fix-migration

Fixes migrations