Replaced some commands with toggles
Fixed recursive mappings
Misc vimrc tweaks