Fixed setup.py for proper packaging
Merge pull request #2 from shaunduncan/master

Fixed setup.py for proper packaging