Add matchit plugin
Replace personal refactoring with ruby refactoring