Refactor, remove unneeded bits

[#63154330]

Signed-off-by: Karl Isenberg <kisenberg@pivotallabs.com>

Conflicts:
	Godeps/Godeps.json
	main.go
	router/helper_test.go
	router/integration_test.go
	router/router.go
	router/router_test.go