Get all scala imports up to 2.11, fix bad imports