Removed SMS twilio requirement
Merge branch 'my'