Replaced Vundle with NeoBundle, since it's no longer maintained and the latest version is broken
Changed mappings for vim-skip, since the defaults clash with substitute.
Needed to modify some other plugins to avoid clashes between the mappings.