pep8
Entry points converted to dict
Cleanup of setup.py

* Some pep8 fixes
* Entry points converted in dictionary format
Merge pull request #1282 from rshk/master

Refactoring of setup.py