zsh: Lots of changing around and organizing; added some new things
Vim: Don't clobber useful default Vim mappings