- got rid of redundant copy of help message text
- modified help text to put items that operate on same object near each other
  in message
merging back from cli-refactor after modifying help messages
Merge branch 'cli-refactor' of github.com:CCI-MOC/haas into cli-refactor
- added space after prompt for user name
- added space after prompt for user