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
skip already visited transactions
tests for builder
fixed bug on OBColorDefinition.run_kernel() 8-[  ]
Merge remote-tracking branch 'killerstorm/aided'
builder tests passing for new scanning method