Tidy up some commandLine stuff
Merge pull request #1055 from matheod/commandLineEscape

Tidy up some commandLine stuff