get sputnik to read configuration from a directory outside /etc
doc how to run your own sputnik config
update sputnik to 2.1.1

release notes: http://update.teradek.com/release_notes.html?product=sputnik&&
add a 'make test' target for one-off make sure this works containers
Squashed 'mandrill/' changes from 50a49d4..035361a

035361a Merge mandrill changes from docks
db47901 change port to 587
1763465 rename variable for consistency
ffd14e7 change base image from ubuntu to our own so it has shellshock fix
40638d3 remove env file (API key already revoked)
d341eae move from docker-mandrill repo to here

git-subtree-dir: mandrill
git-subtree-split: 035361ae713cf4104a2be6eadef89c3e9cd80f74
Merge commit '4deae3155f557622837556bfb1230ecf01239907'

sync the git history between docks and docker-mandrill
Merge commit 'ff83130f33d493e7e5b92f7c33f13676b63042bf' into updates
Merge pull request #6 from texastribune/updates

bring in upstream changes