Corrects spelling of Zenburn vim addon.
Switch default push to matching.
Merge branch 'master' into osx