making package work with setup.py install
merged john's updates
Merge pull request #1 from JustinSGray/master

fixed setup.py file