dotfiles-valentine commit for Sun May 25 09:28:01 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.emacs.d/config/ft-haskell.el