Better whitespace mappings and highlighting
Map ci to vi
Match whitespace on mode change