Adding vi mode, electric commander and docker support