Merge pull request #1 from CodyDunlap/development

Development
added MandrillApi
changes
finished merging