addded api method
Merge branch 'develop' of https://github.com/CounterpartyXCP/counterblockd into develop
mine xcpfeeds
xcpfeeds
ignore conf file
removed counterblockd.conf from tracking
Merge branch 'develop' of https://github.com/porqup1ne/counterblockd into develop

Conflicts:
	.gitignore
	lib/blockfeed.py
	lib/events.py