This sbt goes to 11... err... 13.

Minor fixes so we can leverage sbt 0.13.   Remove some hardcoded sbt knowledge so we work across 0.12 + 0.13.

Review by @havocp or @jamesward