dotfiles-comet commit for Mon May  5 08:33:23 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

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