Cleanups, and hack for relative dir problem in sbt.