mattdrayer/master: Fixed south integration and migration file