BLD: Fixed setup.py to include new packages
Merge pull request #17 from ericdill/fix_setup

BLD: Fixed setup.py to include new packages