Merge pull request #49 from brndnmtthws/master

Fix typo
Configure Marathon for Travis CI
Update to Chaos 0.4.2
Fix mesosRole None
Add Travis CI /master build status image

Keep that build passing.
Fixed web UI redirection by proxy.

Instead of redirecting web requests to the other master, we'll just
proxy everything.
Kill tasks that aren't running after 60 seconds.

By default, tasks which don't enter TASK_RUNNING after 60s should be
killed.  This parameter can be changed via command line with the
`--task_launch_timeout` switch.
Fixed Marathon's task accounting.

We must guarantee that Marathon will never launch more than N instances
for a given app (where N is the number of instances requested).