Updated for sbt 0.13
Updated a couple val names and comments