dotfiles-comet commit for Wed Jun 18 21:17:03 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

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