Removed path manipulation functions and replaced with relative imports.
Added missing files from commit and removed .old files
Got py.test, tox, and setup.py working acceptably for now.