bump sbt to 0.13.6 and fix dependency conflict
Merge pull request #28 from paypal/feature/sbt-0.13.6

Bump sbt to 0.13.6 and fix dependency conflict