Add vim as editor; remove vi -> vim alias