Fix typo
Merge branch 'master' into python_egg
Add default mesos container env variable
Merge branch 'python_egg' of https://github.com/stevendborrelli/mesos-docker-containerizer into python_egg