git merge-all: comments; hiding error messages
added C- C-r for cmdline (since i have masked c-r); tweaks for C-W x and X
asyncfinder excludes inline with grep excludes
Merge branch 'mac_compat'
tags for erb files (Ruby templates)
merge-with-stashing and comments
A few changes so that csearch can be used instead of grep.
another attempt to place the close button where it should be
Merge branch 'master' of https://github.com/joeytwiddle/rc_files

Conflicts:
	.gitconfig
	.vimrc
FIX for 572eabc: I had put -- in the wrong place; and sometimes it should be grep_expr_option
FIX If reloading grep.vim after letting Grep_Path=csearch, we need to overwrite previously calculated Grep_Allow_Empty_FileList
Employ correct word-boundary pattern when using csearch
passing arguments didn't work as i expected
just comments
Unify colors over xterm, xterm-256, GVim.  My old eyes prefer consistency to occasional prettiness.
auto-detect 256-color xterm (at least under my Ubuntu 12.04) and set t_Co automatically
add - to iskeyword for HTML files, always set autoread when undo-through-read is available, show HTML ids in Taglist
Disabled jComment
We need fewer <CR>s on <F4> with csearch, because it has a shorter / empty filelist
Removed unused key mappings