ignores for pydev
new vocabulary and other small changes
new ColorDataBuilder algorithm idea: AidedColorDataBuilder
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	coloredcoinlib/blockchain.py
	utxodb.py
ignore
get_colorvalues
building killerstorm algorithm
untested new algorithm
removed unnecessary stuff
builder test
missed this
builder test
Merge branch 'master' of https://github.com/maraoz/ngcccbase into aided
fixes in AidedColorDataBuilder.scan_blockkchain
fixed AidedColorDataBuilder
Merge pull request #34 from jimmysong/34

Forgot to fix up blockchain.py given the pycoin stuff.
skip already visited transactions
p2ptrade work-in-progress (doesn't work!)
Issue #11: parse values.

Also affects the definition of the "bitcoin" asset to default to full bitcoins.
Also affects the "balance" and "send" commands (not tested!)
Merge pull request #35 from arichnad/master

Issue #11: parse values.