bring in upstream changes

testing subtrees.

* I merged the mandrill changes here into docker-mandrill. bring that merge commit back in so they're reconnected. github says there's no diffs, and a quick inspection shows that nothing has changed

* pulling in upstream changes in the sputnik image.