dotfiles/locust commit for Wed Nov 26 21:14:49 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.Xresources
	.emacs.d/config/lf.el