adding JSON output and a few other tweaks to ws-client
resolving conflicts
Merge branch 'master' of github.com:benjchristensen/WSPerfLab