Merge from ben (Update Xdefaults to chnage colors)
Merge remote-tracking branch 'origin/master' into robert
Update .zshrc to handle hostname alias