Various changes for better terminal integration
Switch from vundle to vim-plug, and some other minor things