Combined migrations into 1 migration
Modified a migration such that it should not cause issues on Travis or QA
Merge pull request #33 from praekelt/feature/issue-25-south-problems

Combined migrations into 1 migration