Merge pull request #1 from ripple/master

catching up to master
fixed usage syntax for --json flag
Merge pull request #223 from mDuo13/master

[BUG] Fix usage info for -j, --json cli switch