Moved more code from vimrc into plugins