Merge branch 'tmsp-unified' into develop-tmsp

# Conflicts:
#	DOCKER/Dockerfile
#	Godeps/Godeps.json
#	Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_bsd.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/client.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/client_server_test.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/client_test.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/conn.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/doc.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/json.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/json_test.go
#	Godeps/_workspace/src/github.com/gorilla/websocket/server.go
#	Godeps/_workspace/src/github.com/inconshreveable/log15/term/terminal_notwindows.go
#	Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_windows.go
#	Godeps/_workspace/src/github.com/naoina/toml/decode.go
#	Godeps/_workspace/src/github.com/naoina/toml/encode.go
#	Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
#	Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
#	Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go
#	Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go
#	Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache_test.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_test.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/go13_bench_test.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record_test.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage_test.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
#	Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go
#	Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/encode.go
#	Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy.go
#	Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy_test.go
#	Godeps/_workspace/src/github.com/tendermint/flowcontrol/flowcontrol.go
#	Godeps/_workspace/src/github.com/tendermint/flowcontrol/io.go
#	Godeps/_workspace/src/github.com/tendermint/flowcontrol/util.go
#	Godeps/_workspace/src/github.com/tendermint/log15/logger.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/reactor.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/common/io.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/config/config.go
#	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/consensus/height_vote_set.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/reactor.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/state.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/test.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/events/events.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_node.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_proof.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/node/node.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/node/node_test.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/netaddress.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer_set.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/consensus.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/mempool.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/handlers.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/types/node.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/types/priv_validator.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set_test.go
#	Godeps/_workspace/src/github.com/tendermint/tendermint/wire/util.go
#	Godeps/_workspace/src/golang.org/x/net/context/context_test.go
#	Godeps/_workspace/src/golang.org/x/net/netutil/listen_test.go
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/.gitignore
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/README.md
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/baked_in.go
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/benchmarks_test.go
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/doc.go
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/examples_test.go
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/validator.go
#	Godeps/_workspace/src/gopkg.in/bluesuncorp/validator.v5/validator_test.go
#	circle.yml
#	erisdb/codec.go
#	erisdb/methods.go
#	erisdb/pipe/consensus.go
#	erisdb/pipe/pipe.go
#	erisdb/restServer.go
#	erisdb/serve.go
#	erisdb/wsService.go
#	evm/native.go
#	rpc/core/types/responses.go
#	rpc/test/helpers.go
#	state/permissions_test.go
#	state/test.go
#	state/tx_cache_test.go
#	state/types/genesis.go
#	test/transacting/transacting_tes.go
#	test/transacting/transacting_tes.go_
#	test/transacting/transacting_test.go
#	txs/tx.go