Merge check
Merge branch 'dev' of github.com:mozilla-services/pushgo into dev
Merge branch 'dev' of github.com:jrconlin/pushgo into bug/tls
add configs