Removing mergetool setting editor to which ever vim is on path
Adding python mode to vim