Merge branch 'master' of git://github.com/topshed/enviroplus-python into topshed...