Merge branch 'master' into develop
fixed packaging issue and added a changelog
bumbed version number to 0.6, and added some things to MANIFEST.in
Merge branch 'release-0.6'