A number of changes to setup and to code that makes for more pythonic install and usage