Improved sbt completion