dotfiles commit for Wed Jan 29 02:42:48 MST 2014
Merge branch 'valentine' into comet

Conflicts:
	herbstluftwm/autostart