More radical changes
Cleaned up vimrc.