Add VI mode to fish after updating to master.

Includes cursor differentiation in normal / insert mode.