tweak jvm options based on [Getting Started](http://www.scala-sbt.org/release/docs/Getting-Started/Setup.html).
Merge branch 'fix-jvm-options' into develop
Merge branch 'fix-broken-no-share' into develop