Moved more settings out of vimrc into separate plugin files