Conflicts: cmd/tendermint/flags.go glide.lock glide.yaml node/node.go rpc/core/routes.go version/version.go