Lots of changes, now using Vundle, cleaned up vimrc