minor cleanup
use sbt 0.13 macro syntax in a few more places