Moved code out of vimrc into individual plugins