Consolidating the servers behind one port

including swapping out go.net/websocket with gorilla/websocket, and I
have no idea if it works since the disco is gone :-(  Time to add back
the disco?  Oh wait.  Tests.
Renaming and rearranging per feedback on #25
Merge remote-tracking branch 'upstream/master' into combine-servers

Conflicts:
	Procfile
Pointing at new godep location
Switching imports to point at new martini location

plus updating all of the other dependencies.
Collapsing together HTTP and WebSocket a bit more

as well as using the correct bind address.
removed runall config and instead set all services=t when -all

Also removed the ||'s during startup to make code a bit more concise
Removed unneeded quit channel from main

Since all endpoints are now hosted off one http service, they no longer
need to be launched in goroutines. This removed the need for the quit
channel which was only used to prevent the application from exiting
prematurely.

Also moved the exit logging up a layer for the same reason.
Refactored the services to "mount" to one http service handler

* Http mounts to a servemux
* Split service setup and initialization into two parts
* Moved error logging into main startup routine
Made the websocket services mounted endpoints
Fixed broken tests
Merge pull request #1 from egravert/combine-servers

Combine servers
Merge remote-tracking branch 'upstream/master' into combine-servers

Conflicts:
	config/config.go
	config/usage.go
Merge pull request #25 from meatballhat/combine-servers

Consolidating the servers behind one port