Concatenate genesis block lines at compile time, not runtime
Merge pull request #38 from vikramrajkumar/btsx

networking fixes
Save config.json after merging new default peers
Restore market transaction key labels on rescan
Improve wallet_recover_transaction
bump genesis
Added key sequence per account rather than global

This should allow recovery of which account various orders belonged to.
I also stored the key sequence number in the key record for a future
update that will enable "pre-scanning" for running wallets in parallel.
Refactor blockchain_market_order_history and remove block_limit
Merge branch 'develop' of github.com:bitshares/bitshares_toolkit into develop
utility to convert bitcoin pubkey into btsx pubkey
Merge branch 'genesis_newlines' of github.com:drltc/bitshares_toolkit into develop
Merge pull request #729 from drltc/genesis_newlines

Concatenate genesis block lines at compile time, not runtime
Merge pull request #734 from xeroc/master

utility to convert bitcoin pubkey into btsx pubkey
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Merge branch 'master' into develop
Update .gitignore
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Add option to blockchain_market_order_history to filter by owner
Add owners to market history printout
Fix formatting and logic errors in blockchain_market_order_history