remove Option types and update to sbt 0.13.1