refactored, eg. used os.path where applicable.
Merge branch 'master' of github.com:policecar/data-tapping