Updated to support docker
Merge branch 'master' of http://github.com/gavinln/mesos-marathon