preserving colon in file paths
Merge branch 'master' of github.com:derek-watson/jsUri