Cleaned up vimrc and sorted into sections to make future changes more productive