Initial commit
Merge branch 'release-0.2.0'
Removed rogue settings.py file
Merge branch 'hotfix-0.2.1' into dev