fixed migration file and changed relationships naming
Merge pull request #1 from jherrlin/master

fixed migration file and changed relationships naming