Reorganized vimrc, switched to vundle