Updates based on writing, and to sbt 0.13.0-M2