x
Merge branch 'master' of https://github.com/vl3/dotfiles

Conflicts:
	Xdefaults
	vim/.Xdefaults~
	vim/.xinitrc~
	vim/autostart~
	vim/satisface.hs~
	vim/valor.pl~