Added vim git plugin for diffing conflicts.