add directories to setup.py, CMakeLists.txt
Merge pull request #257 from adwilson10/fix_setup

Add directories to setup.py, CMakeLists.txt