hal
hal stuff

xresources for urxvt
updated pathogen
added gnome-term -> xterm256 to zshrc
colors in vimrc
resolved merge
Preparing to merge
Merge branch 'master' into new
Updated pb hosts