added XQuartz window manager
Merge branch 'master' into mac_compat
Tools like grep and xargs have different paths on BSD/Linux, but who needs paths?  The BSD tools seem to work well enough anyway.
avoid problematic mapping in Mac xterm
Various tweaks/fixes for Mac OSX
Merge remote-tracking branch 'origin/master' into mac_compat
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