+ use mvim as EDITOR
+ p4merge
+ fix "Open with" menu
+ deal with Java