removed vi alias; EDITOR now points to /usr/bin/vim