Updated vim mapping, less now part of passive and diffmerge is the default merge tool

More on Mappings:

- +, - to make vim splits larger/smaller.
- F6 to toggle between opened tabs.