Bumped version and removed __version__
Fixed MANIFEST.in to exclude cache
Merge remote branch 'upstream/master'

* upstream/master:
  Fixed MANIFEST.in to exclude cache
  Bumped version and removed __version__