added fix to ensure sms messages get sent out from the notifier
removed references to subscription.contact, and fixed issues in tests with new sms stuff
Merge branch 'sms-fixes'