Fix issues with vi and git by using vim!