Merge pull request #1298 from ricksladkey/fixes-1249

Fix colon prefix problems
Merge pull request #1299 from ricksladkey/fixes-missing-commit

Fix parser hang on syntax error
Fix path resolution to match vim behavior

- Resolve defined variables leaving others "as is"
- Merge ExpandEnvironmentVariables with ResolvePath
- Adjust filesystem unit test now that "~" always resolves
Merge remote-tracking branch 'upstream/master'
Merge branch 'fixes-filenames'