Merge pull request #1 from mikeal/master

Pulling updates from mikeal
Hardcode http-proxy version to fix `serve`
Merge pull request #87 from rjsteinert/master

Hardcode http-proxy version to fix `serve`