Server: more CLI usability enhancements.
Merge branch 'master' of https://github.com/mikehearn/PayFile