removed path.py dependency
conflict resolution and pep8
Merge branch 'collinanderson-nopath'