pep8
Entry points converted to dict
Add organizations to the default facet titles

Currently this is only set in the package controller, so on all other pages that display the facets the title is not displayed correctly
Merge pull request #1286 from ogdch/fix-org-facet-title

Add "organizations" to the default facet titles
Cleanup of setup.py

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

Refactoring of setup.py