Initial update to work with updates to cloudlet framework. Email working, SMS not tested