update to scala 2.11 and some editor compat changes