Merge branch 'allow-m-arrow-mappings-in-macvim' of https://github.com/jszakmeister/vimfiles
user/jszakmeister: setup a localvimrc whitelist
user/jszakmeister: setup different fswitch matches for my company setup
user/jszakmeister: only expand templates in an empty buffer

The user can set g:OnlyInsertTemplateOnEmptyBuffer to 0 if they want to
override this behavior.  In this case, we'll delete the content of the
buffer and expand the template.
user/jszakmeister: move Grep settings before Gitv to keep them in order
user/jszakmeister: parse through ext components looking for a template

This allows us to use the same mechanism for looking up a template for
.snippets.py as a .py file.  It'll start with .snippets.py, and then
move to .py, if it doesn't find a matching template.
user/jszakmeister: add [n and ]n mappings to jump between conflicts

This is inspired by vim-unimpaired, but different.  vim-unimpaired jumps
between the various portions of a conflict, whereas this jumps only to
the beginning of a conflict.