fixing typo in admin cli help
adding an extra check for pid-file creation, and making the output more reliable, especially when daemonizing
Merge branch 'next' into sam_scopes