A bunch of little things that should not have been committed

Note: one should test before commiting code

Also, conditionally imported setuptools in setup.py.  `python setup.py develop` ... its a wonderful thing