Conflicts:
	Godeps/Godeps.json
	Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint/config.go
	Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test/config.go
	Godeps/_workspace/src/github.com/tendermint/tendermint/node/node.go
	circle.yml