Merge branch 'refactor'

diff --cc Makefile
Simple merge

diff --cc README.md
index 5cf42ab67d0a24b812f9bfc72e97b077eff4e53b,b5ec05ca427e4cd18475cedb85ea101d8641248e..92895ce8d13064035e4621d9bfe3085bad95d7fe
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -17,19 -16,6 +17,17 @@@ The server's RSA key fingerprint is `e5
  
  (Apologies if the server is down, try again shortly.)
  
- **If you're going to be diving into the code, please use the [refactor branch](https://github.com/shazow/ssh-chat/tree/refactor) or see [issue #87](https://github.com/shazow/ssh-chat/pull/87).** It's not quite at feature parity yet, but the code is way nicer. The master branch is what's running on chat.shazow.net, but that will change soon.
- 
 +## Compiling / Developing
 +
 +You can compile ssh-chat by using `make build`. The resulting binary is portable and
 +can be run on any system with a similar OS and CPU arch. Go 1.3 or higher is required to compile.
 +
 +If you're developing on this repo, there is a handy Makefile that should set
 +things up with `make run`.
 +
 +Additionally, `make debug` runs the server with an http `pprof` server. This allows you to open
 +[http://localhost:6060/debug/pprof/]() and view profiling data. See
 +[net/http/pprof](http://golang.org/pkg/net/http/pprof/) for more information about `pprof`.
  
  ## Quick Start