Ran through go fmt
Merge branch 'master' of github.com:dougt/go-push-server

Conflicts:
	src/mozilla.org/push/server.go