Misc changes
Merge branch 'master' of https://github.com/steowens/path-utils