update setup.py, fixes #26
Merge branch 'master' of github.com:sunlightlabs/jellyfish