#NO_ISSUE Constraints refactoring
#108 Fix concurrent updates
Merge pull request #259 from drexin/wip-108-fix-concurrent-updates-drexin

#108 Fix concurrent updates
Simplify health checks: get rid of response code list
Use correct range
Merge pull request #253 from drexin/wip-refactor-constraints-drexin

#NO_ISSUE Constraints refactoring
Merge pull request #260 from mesosphere/health-api-simple

Simplify health checks: get rid of response code list
Fixes #146 - Zookeeper connection errors on start
Formatting fix
Merge pull request #265 from mesosphere/wip-146-zk-robustness

Fixes #146 - Zookeeper connection errors on start
use instance binding
Asynchronously call sys.exit() to avoid deadlock due to the JVM shutdown hooks.
Switch to scalatest

Using JUnit was sometimes awkward because there are no Scala-ish matchers.
Scalatest is mature enough now to use it here.
Purge the queue when scaling down apps. Fixes #254

Also improve logging.
Add a test for scale down
Merge pull request #268 from mesosphere/scalatest

Switch to scalatest
Switch everything to log4j
Bump chaos version
Merge pull request #267 from mesosphere/fix-254

Purge the queue when scaling down apps. Fixes #254
Merge branch 'pr/261'

Conflicts:
	src/main/scala/mesosphere/marathon/MarathonScheduler.scala