Added documentation
Convert go routine to saner timeout
rebase
Merge branch 'feature/client_pong' of github.com:mozilla-services/pushgo into feature/client_pong

Conflicts:
	config.sample.toml
	src/github.com/mozilla-services/pushgo/simplepush/app.go
Merge branch 'dev' of github.com:mozilla-services/pushgo into feature/client_pong

Conflicts:
	CHANGELOG.rst
More merge fun, removed AlwaysRoute detrius
Merging #175.