Merge branch 'release/1.0.13' into develop
Merge pull request #31 from praekelt/master

Merge branch 'release/1.0.13'
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
Updated version number
Merge branch 'release/1.0.14'