Merge branch 'master' into develop
updated MANIFEST.in
fixed hadoop_conf auto-detect for hadoop 2
version bump
Merge branch 'develop'