Change EDITOR and remove unused aliases. Using vi-mode.