Merge pull request #30 from vikramrajkumar/btsx

Merge upstream
Merge pull request #31 from vikramrajkumar/btsx

Merge upstream
[testnet] added wait for rpc port before inititilizing
Merge branch 'develop' of github.com:BitShares/web_wallet into develop
[testnet] moved config edits to parameters
[testnet] nc did not work on mac
Merge branch 'develop' into btsx
ruby bitshares rpc client
Merge branch 'develop' into btsx