SBT/JVM options: Add '@'-trick and #-style comment
upgrade SBT to 0.13.0-RC4
Merge commit 'refs/pull/54/head'
Merge commit 'refs/pull/43/head'