Fixing for 2.3
Fixing samples
Fixing sbt
Switching to 2.10.4
Fixing sbt
Cleaning up
Fixing sbt