Transitioning to vim-plug. Massive cleanup.
Tweaks and fixes