Use our default text settings as a basis when editing gitconfig files.
Set better javadoc title and tag colors in szakdark.

The default color is white, which distracts you from the code.
Merge branch 'szakdark-java' of https://github.com/jszakmeister/vimfiles
user/jszakmeister: add a snippet to print the stack trace in python

This will print the current stack trace at the line being executed.
It's a nice debug tool when you need to know what the call chain is.
user/jszakmeister: conditionalize any code that uses python
user/jszakmeister: disable ultisnips if python is not available
user/jszakmeister: update my snippet template
user/jszakmeister: start snippets for cmake
user/jszakmeister: allow the default font size to be overridden locally
user/jszakmeister: fix and add a cmake snippet
user/jszakmeister: set TERM to xterm-256color for Gnome Terminal
user/jszakmeister: cope with ///-style doxygen comments
user/jszakmeister: pick better font sizes

This tries to be a bit smarter about recognizing when Vim is running
under VMWare, and adjust the font size accordingly.  It also chooses a
better default based on whether your running under Windows, Mac, or
something else.
user/jszakmeister: treat my .etcrc file as shell
user/jszakmeister: add a template for .c and .h files
user/jszakmeister: add a mapping for 'edit' in interactive rebase
user/jszakmeister: add some settings for hacking on Neovim
user/jszakmeister: add a fatal error message snippet for cmake
user/jszakmeister: wrap up some python-related bits in a function call

Without this, Vim will fail to parse the block correctly when Python is
not available.
user/jszakmeister: use 2 space indents for make in Neovim