Upgraded http-proxy version and fixed up nodejitsu_server to serve www, admin and couch
Tweak indentation to pass jshint
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Merge pull request #230 from wrangr/master

Upgraded http-proxy version and fixed up nodejitsu_server