Fixed MANIFEST.in to include things that were missing
Beef up the setup information
Merge branch 'fix_setup'

* fix_setup:
  Beef up the setup information
  Fixed MANIFEST.in to include things that were missing