renamed xmpp receiver watch name so that we don't confuse it with the app's god watch name
Merge pull request #403 from shatterednirvana/rename-xmpp-receiver-god-watch

Renamed xmpp receiver watch name
changed terminate script to not kill itself
Making sure our ntp cron job isn't wiped out by the app controller
Merge pull request #406 from jovanchohan/ntp_fix_2

Making sure our ntp cron job isn't wiped out by the app controller
Merge pull request #405 from shatterednirvana/terminate-script-doesnt-kill-itself

changed terminate script to not kill itself