(master) various small fixes
Merge branch 'master' of github.com:cmcculloh/GitScripts