Updated .vimrc for new version of vundle, also organized a bit