removed all instances of 'from .module import something' because it was causing all sorts of issues for nosetests where the files were being loaded in the source rather than the installed version.