Switch to dark theme in terminal and vim
Disable scrollbars
Merge branch 'master' of github.com:pquentin/dotfiles

Conflicts:
	.Xresources
Highlight searchs in vim
dump awesome wm config