added mandrill support
Merge branch 'master' of https://github.com/knigam/codeforgood-team6