Add conf/* to MANIFEST.in
Merge branch 'develop' of github.com:viglesiasce/koala into develop