dotfiles-comet commit for Thu Jun 26 10:43:59 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.emacs.d/config/lf.el
dotfiles-comet commit for Sat Jun 28 21:21:31 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles