Updated nbscala.diff for scala 2.11.x