fix for setup.py?
Merge branch 'master' of github.com:Doula/Doula