minor edits
Merge branch 'master' into command-line-fix-jbs
Merge pull request #156 from basho/command-line-fix-jbs

minor edits