merged in setup.py from gh-pages