remove hard-coded-path checks so tests will work on travis
Merge branch 'master' into fix-tests-for-travis
fix collection test errors
remove use of timedelta.total_seconds() for python 2.6 compat.
Merge pull request #37 from mozilla/fix-tests-for-travis

Fix tests for travis