refactor, upd sbt/scala versions
Merge branch 'master' of github.com:vidma/scala-kiwiland