dotfiles/locust commit for Wed Dec  3 19:34:28 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	general/home/.emacs.d/ac-comphist.dat
Change a path in .zshrc to be more FreeBSD friendly.

I don't use FreeBSD, and I don't plan to. But, it is good practice. Basically,
the old thing said /home/pete/... On FreeBSD, the home directory is
/usr/home/pete (by default), so I figured I should change it.
Remove some extraneous stuff.

I removed a number of aliases and $PATH changes from the ~/.zshrc file. I didn't
need them, and they can only slow down shell startup.
Fix some options in aliases.

* grep was case-sensitive by default, so I changed that.
* xrdbo was "xrdb ~/.Xresources", I added -merge as a flag, which IIRC is more
  proper.