Set default editor to vi
Merged 2 edits