urxvt don't scroll
Minor updates
Merge branch 'master' of github.com:senft/dotfiles

Conflicts:
	.Xdefaults