Fixing the chronos-marathon script
Merge branch 'chaos-port' of github.com:mesosphere/chronos into chaos-port