Merge branch 'release/0.2' into develop
Compromise on a foreign key being null so South migration works on legacy database
Remove comment
Merge branch 'feature/allow_none_for_south' into develop
Prep for release
Merge branch 'release/0.2.1'