Upgrade sbt version and tidy up Makefile