Updated settings to match private module
All push functionality deprecated.  Let's figure out how to do
websockets.
Merge branch 'master' into comm-contact-quick-fixes