Merge branch 'master' into develop

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

cmd/tendermint/flags.go

@@ -20,11 +20,15 @@ func parseFlags(config cfg.Config, args []string) {
 		logLevel      string
 		proxyApp      string
 		abciTransport string
+
+		pex bool
 	)
 
 	// Declare flags
 	var flags = flag.NewFlagSet("main", flag.ExitOnError)
 	flags.BoolVar(&printHelp, "help", false, "Print this help message.")
+
+	// configuration options
 	flags.StringVar(&moniker, "moniker", config.GetString("moniker"), "Node Name")
 	flags.StringVar(&nodeLaddr, "node_laddr", config.GetString("node_laddr"), "Node listen address. (0.0.0.0:0 means any interface, any port)")
 	flags.StringVar(&seeds, "seeds", config.GetString("seeds"), "Comma delimited host:port seed nodes")
@@ -36,6 +40,10 @@ func parseFlags(config cfg.Config, args []string) {
 	flags.StringVar(&proxyApp, "proxy_app", config.GetString("proxy_app"),
 		"Proxy app address, or 'nilapp' or 'dummy' for local testing.")
 	flags.StringVar(&abciTransport, "abci", config.GetString("abci"), "Specify abci transport (socket | grpc)")
+
+	// feature flags
+	flags.BoolVar(&pex, "pex", config.GetBool("pex_reactor"), "Enable Peer-Exchange (dev feature)")
+
 	flags.Parse(args)
 	if printHelp {
 		flags.PrintDefaults()
@@ -53,4 +61,6 @@ func parseFlags(config cfg.Config, args []string) {
 	config.Set("log_level", logLevel)
 	config.Set("proxy_app", proxyApp)
 	config.Set("abci", abciTransport)
+
+	config.Set("pex_reactor", pex)
 }