formatting
Merge branch 'mcgo' of git://github.com/jrconlin/pushgo into mcgo

Conflicts:
	src/mozilla.org/simplepush/server.go
	src/mozilla.org/simplepush/worker.go