Correct a bug in the mvn.el import reformatter, and move some project-specific import rules into local.el.