Switched from using google mail to mandrill
Fixed naming issues with calendar