Merge pull request #47 from CounterpartyXCP/develop

1.4.0
Merge pull request #48 from CounterpartyXCP/develop

modified iwatch to not be so chatty
Merge pull request #56 from CounterpartyXCP/develop

doc changes, and do not use newrelic with counterblockd
Merge pull request #57 from CounterpartyXCP/develop

build script fixes for ubuntu 12.04
Merge pull request #60 from CounterpartyXCP/develop

sync to develop, 1.5.0 PRE
Merge pull request #65 from CounterpartyXCP/develop

1.5.0 PRE2
quick fix for #74
hot fix
Merge branch 'develop'

Conflicts:
	setup_federated_node.py
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #88 from CounterpartyXCP/develop

newrelic: disable for counterpartyd
Merge pull request #89 from CounterpartyXCP/develop

Develop
Merge pull request #90 from CounterpartyXCP/develop

added missing imports
Merge pull request #91 from CounterpartyXCP/develop

allow cw to build successfully without translations
Merge pull request #93 from CounterpartyXCP/develop

update to use insight-api 0.2.11
Merge pull request #94 from CounterpartyXCP/develop

updated setup on ubuntu 12.04 to work again
update restart script
Merge pull request #95 from CounterpartyXCP/master

merge back