Add --no-startup-id to xsetroot launch.
Enable per-directory .vimrc files.
Merge branch 'master' into leo-work

Conflicts:
	.i3/config