dotfiles/locust commit for Sat Nov 29 05:19:32 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	general/home/.Xresources