fix conflict
Merge pull request #3 from gberenfield/master

trivial fix for allowing Vundle to "BundleUpdate"