Continued fixing issues found by Travis CI.  Having an issue with os.path.join that I am still researching.