/valentine commit for Fri Nov 28 16:30:23 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.Xresources
	general/home/.icons/flattr-icons