Merge pull request #1 from eucalyptus/develop

Merge upstream
Add conf/* to MANIFEST.in
Merge branch 'develop' of github.com:viglesiasce/koala into develop
Merge pull request #329 from viglesiasce/develop

Changes needed for packaging using sdist