Added cad. Removed vi -> vim alias