Merge pull request #266 from rrthomas/master

Fix some occurrences of dirName→baseDir overlooked in PR#261
Merge pull request #265 from rrthomas/cli-improvements

Tidy up executables
Fix red-pill for new executable paths