Bugfixes
Bug workaround for setuptools change
Merge branch 'master' of github.com:redhog/appomatic