Reorganize vimrc, trim some of the fat