Add alias for mt for merge tool

* Update editor to mvim