Upgrade to sbt 0.13.5 + other simplifications
Merge pull request #185 from jaceklaskowski/sbt-0-13-5-upgrade

Upgrade to sbt 0.13.5 + other simplifications