Update setup.py
temporarily disable osascript
Merge remote-tracking branch 'origin/master'
bump version
enable osascript again
#3
django settings can now be overwritten in config.yml (this means adding django modules is possible now)