Upgrade to sbt 0.13.5 + other simplifications

Please review and commit. Thanks!