Misc changes
vimrc: unimpared
urxvt: disable scroll on output
Merge branch 'master' of github.com:everett1992/dotfiles

Conflicts:
	Xdefaults
	zshenv