Sync with upstream.
Recognize the gitconfig filename as a gitconfig file type.

This is mainly for me and my etc repository.
Add a command to help toggle colors when printing diffs.

Vim keeps the background color from my scheme, and it makes it hard to
read on a printout.  OTOH, I like having a background color because it
shows whitespace changes.  I don't print diffs often, so this seems like
a reasonable compromise.
Sync with upstream.
Add a new mapping.

Picked this one up from Drew Neil's VimCasts.org.
Add the PrettyXML command.

I don't need it often, but it's handy when I do.
Sync with upstream.
Sync with upstream.
Merge branch 'js/mine'