diff --git a/.gitignore b/.gitignore
index 1c593002a..c4760c4f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.swo
 .bak
 tendermint
+.DS_Store
diff --git a/Makefile b/Makefile
index ebb1d9dbe..d8ac7f82a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
+.PHONY: get_deps build all list_deps
+
 all: build
 
-build:
+build: get_deps
 	go build -o tendermint github.com/tendermint/tendermint/cmd
 
-build_race:
+build_race: get_deps
 	go build -race -o tendermint github.com/tendermint/tendermint/cmd
 
-test:
+test: build
 	go test github.com/tendermint/tendermint/...
 
 list_deps:
@@ -14,3 +16,6 @@ list_deps:
 
 get_deps:
 	go get github.com/tendermint/tendermint/...
+
+clean:
+	rm -f tendermint
diff --git a/config/config.go b/config/config.go
index 47c9b8ba6..5622614e1 100644
--- a/config/config.go
+++ b/config/config.go
@@ -37,7 +37,7 @@ Level =           "debug"
 
 [RPC.HTTP]
 # For the RPC API HTTP server.  Port required.
-ListenAddr = "0.0.0.0:8081"
+ListenAddr = "localhost:8081"
 
 [Alert]
 # TODO: Document options
@@ -55,7 +55,7 @@ func initDefaults() {
 	App.SetDefault("Log.Stdout.Level", "info")
 	App.SetDefault("Log.File.Dir", rootDir+"/log")
 	App.SetDefault("Log.File.Level", "debug")
-	App.SetDefault("RPC.HTTP.ListenAddr", "0.0.0.0:8081")
+	App.SetDefault("RPC.HTTP.ListenAddr", "localhost:8081")
 
 	App.SetDefault("GenesisFile", rootDir+"/genesis.json")
 	App.SetDefault("AddrBookFile", rootDir+"/addrbook.json")