add: mandrill-api to package.json
Merge branch 'master' of github.com:BWOC/BMI-API
Merge branch 'master' of github.com:BWOC/BMI-API

Conflicts:
	package.json