Cleaning up vimrc and grouping some functionality.