master build now only supports scala 2.10
Merge pull request #402 from fommil/branched

master build now only supports scala 2.10