Urxvt tabs
Merge branch 'master' of github.com:kragniz/dot-files

Conflicts:
	Xdefaults