.bashrc - Added EDITOR="emacs -nw" for all those wonderful visudos
Merge branch 'master' of github.com:Rovanion/.files
bashrc - Added VISUAL=emacs
Merge branch 'master' of github.com:Rovanion/.files

Conflicts:
	.bashrc