Almost fixed, with a kludge so that unit tests properly load in PyCharm
AND work on the command line with nosetests for Travis.