Improved indenting and fixed up sbt integration