dotfiles-valentine commit for Thu May 29 11:13:00 MDT 2014
dotfiles-valentine commit for Sat May 31 09:11:56 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

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