Cleaning up and fixing setup.py
Merge pull request #30 from daviddavis/temp_1369061847

Cleaning up and fixing setup.py