sbt 0.13.6, use xsbt.util, improve key names, cleanup