Merge branch 'master' of https://github.com/andrewdhazlett/meteor-mandrill