Removed CMD-W (close) Macvim mapping
Refactor