Merge branch 'add-vim-indent-guides' of https://github.com/jszakmeister/vimfiles
Merge branch 'better-java-method-nav' of https://github.com/jszakmeister/vimfiles
user/jszakmeister: rework template mechanism trigger on ``skel``