clean up, better ESC with <C-K>
Merge remote-tracking branch 'origin/master'