Finished mandrill and twilio stuff
Fixed merge conflict