Upgrade scalatest (Travis can't find the old version) and fix some scalariform warnings