Fix return key mapping conflicts with auto-pairs
Merge pull request #427 from mkc188/master

Fix return key mapping conflicts with auto-pairs
Revert some changes to get back compatibility
Merge pull request #428 from mkc188/master

Revert some changes to get back compatibility