Various small changes, notably changed bash to vi mode