Fixing the startup scripts for chaos
Merge branch 'master' of https://github.com/airbnb/chronos into startup-scripts-fix

Conflicts:
	bin/start-chronos.bash
	bin/ubuntu.bash
Fixing some typos
Merge pull request #134 from mesosphere/startup-scripts-fix

Startup scripts fix