updates to vimrc, add bundle/vinegar
fix merge conflicts, update pathogen