Commented out Mandrill.
Merge branch 'master' of heroku.com:afternoon-shelf-2281

Conflicts:
	sites/config.php
Something interesting.
Merge branch 'master' of heroku.com:afternoon-shelf-2281
Something interesting.
Merge branch 'master' of heroku.com:afternoon-shelf-2281
Something interesting.
Something interesting.
Something interesting.
Something interesting.
Something interesting.
Something interesting.
Something interesting.