adding git diverge alias
improving spell check highlighting in vim