Integrate main sbt-extras (fork no more needed!)
[minor] fix a comment in an sbt template
sbt: Don't export JVM_OPTS and SBT_OPTS. Fix #234