dotfiles-valentine commit for Wed Mar 26 21:09:35 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.emacs.d/config/ft-c.el
	.zshrc