Color tweaks, urxvt, i3lock
Merge branch 'master' of https://github.com/anoknusa/i3-config

Conflicts:
	.config/i3/config