switch to vundle, some cleanup in the process