Fix formatting issues and bump to sbt 0.13.5