Added .gmrunrc
Merge branch 'master' of https://github.com/zblach/dotfiles
Added ZLE loading for cursor indicator.
Merge branch 'master' of https://github.com/zblach/dotfiles
Merge branch 'master' of http://github.com/zblach/dotfiles
removed explicit TERM setting
Merge branch 'master' of https://github.com/zblach/dotfiles
moar diffs
fix fix
Added X-keyboard support for urxvt
Merge branch 'master' of https://github.com/zblach/dotfiles
Tweaks
Merge branch 'master' of https://github.com/zblach/dotfiles
Local Changes
Merge branch 'master' of https://github.com/zblach/dotfiles

Conflicts:
	.gmrunrc
	.vimrc
	.zshrc