Revert "Merge pull request #60 from mesosphere/0.6.0-SNAPSHOT"
Revert "Merge pull request #60 from mesosphere/0.6.0-SNAPSHOT"

This reverts commit 68d202c50ad29891e7e4fe931e4b1ada7fa72e0c, reversing
changes made to 9b5dee9a2a86bea2f37f1608f899a4b634f0dc76.

jangie/marathon-client,jangie/marathon-client