Chris
more refactoring (and a minor setup.py tweak)
279b84e