Migrate to sbt 0.13.1 and shuffle dependencies around