C2DM WIP.
Merge branch 'master' of github.com:jhugman/call-me-maybe