minor tweaks to readme, setup.py
Merge branch 'master' into kill-unittest