fix client merge conflicts
re-enable south, note this requires a db wipe