Fix key bindings for easier paste
Merge remote-tracking branch 'origin/master'