Fix dirty missed merge conflict
Fix config, fix migration file name
Merge pull request #8 from rolies106/master

Fix missed config merge and add migrations