dotfiles-valentine commit for Tue Jun 24 04:05:36 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

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