Add my choice of modules
Switch key mapping to vi