UNTESTED: added mux.routing
Merge branch 'travis' of github.com:jrconlin/pushgo into travis

Conflicts:
	go_deps.lst
	simplepush.go
	src/mozilla.org/simplepush/handlers.go
	src/mozilla.org/simplepush/router/router.go
	src/mozilla.org/simplepush/server.go
	src/mozilla.org/util/mz_log.go