Merge pull request #331 from hgschmie/master

Allow arbitrary JVM options to be passed to marathon
Update Tomcat example to include a WAR
Replace timestamp in Task ID with a time-based UUID. Fixes #312
fix travis settings and remove old assembly config
use sbt assembly as build script on travis
fix bin/build-distribution
Merge pull request #332 from mesosphere/task-uuid

Replace timestamp in Task ID with a time-based UUID. Fixes #312
Upgrade scalatest (Travis can't find the old version) and fix some scalariform warnings
80 cols; period to separate UUID and app
Upgrade to 0.19.0 and Mesos-native ContainerInfo.