Added new switch def.
Merge branch 'nyarlothotep' of ssh://github.com/peteches/configs into nyarlothotep

Conflicts:
	vim/vimrc
Merge branch 'nyarlothotep' of ssh://github.com/peteches/configs into nyarlothotep
Merge branch 'nyarlothotep' of ssh://github.com/peteches/configs into nyarlothotep
Edited complete setting as causing some hangups.