Merge branch 'chaos-port' of github.com:mesosphere/chronos into chaos-port
Fixing chronos bindings
Merge branch 'chronos-marathon-fix' into chronos-marathon-fix2

Conflicts:
	bin/start-chronos.bash
Merge pull request #132 from mesosphere/chronos-marathon-fix2

Chronos marathon fix2
Merge branch 'master' of https://github.com/airbnb/chronos into startup-scripts-fix

Conflicts:
	bin/start-chronos.bash
	bin/ubuntu.bash