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