fix tests
sbt 0.13 syntax
support for sbt 0.13
readme updates for 0.13
resolve conflict