Merge pull request #712 from fommil/master

Housekeeping (and uncommenting some tests)
bump sbt version
use scala 2.11.4 for the master build
require sources for tests to start