Updated EDITOR and added alias for vim -> MacVim terminal vim