dotfiles/comet commit for Wed Nov 12 19:29:23 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

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