Map [[, ]], [], and ][ to [m, ]m, [M, and ]M for Java.

The original mappings don't work well with Java, since it expects a
curly brace at the beginning of the line.  While not perfect, [m and
friends offer a much better experience.
Add mappings to navigate conflict markers.
Factor the lookup logic for SpellMap into a separate function.

This will allow reuse of that same logic for indent guides.
Add support for indent guides.

vim-indent-guides wants to work globally by default, using a map to say
which files you don't want guides for.  This setup turns that around and
provides a buffer-local mechanism to turn indent guides on and off.  It
also implements the same scheme as `g:SpellMap` to aid in enabling
indent guides for specific filetypes and groups.  Currently, only Python
is turned on, and only if indent guides is enabled globally by setting
`g:IndentGuides` to 1.
Use // style comments in Java by default.
Merge branch 'add-vim-indent-guides' of https://github.com/jszakmeister/vimfiles
Merge branch 'better-java-method-nav' of https://github.com/jszakmeister/vimfiles