Merge pull request #25 from cancerit/master

cleaning up merge commits
fixed bad pattern based substitution that fails on paths with '.'
push new bugfix
final fix following test run
Merge pull request #26 from cancerit/dev

bad path munging