Need to be able to import from one more directory up.
Merge branch 'hotfix/pythonpath'