test timer
Merge remote-tracking branch 'upstream/master'
optimized AidedColorDataBuilder. tests run in 1 minute
builder.py conflicts fixed
adding time measuring to builder.py tests, with pep8 compliance
starting docs and debugging python-bitcoinlib
README edits
fixed merge conflicts
advancing docs
advancing coloredcoinlib docs
Merge pull request #76 from maraoz/master

coloredcoinlib docs
Issue #6: Forgot about Aided
Merge branch '6b' of https://github.com/jimmysong/ngcccbase

Conflicts:
	coloredcoinlib/explorer.py
Issue #3: Implement POBC Color Definition
Merge pull request #74 from jimmysong/3

Issue #3: Implement POBC
connect to electrum only when necessary
Issue #3: Added compose_tx_spec and compose_genesis_tx_spec

Also hooked it up all the way to the command-line.
I changed the txspec to take color_def instead of color_id.
I also changed the convention of using "0" to mark a target as uncolored.
We are now using a constant UNCOLORED_MARKER, similar to GENESIS_OUTPUT_MARKER
to signify that this is an uncolored target. This makes for a much more consistent
way of handling color definitions throughout.
Merge pull request #77 from jimmysong/3

Issue #3: Added compose_tx_spec and compose_genesis_tx_spec
coloredcoinlib optimizations
colorvalue refactoring