Fixing minor whoops in setup.py and adding new directories to manifest
Merge pull request #466 from jimi1283/miscimprovements

Fixing minor whoops in setup.py and adding new directories to manifest