Small fixes in setup.py to be able to submit to PyPI.
Merge pull request #485 from lrem/master

Small fixes in setup.py to be able to submit to PyPI.