zenburn tweaks + urxvt
zsh history: ignore space
Merge remote-tracking branch 'origin/master'

Conflicts:
	zsh/history