Made jk -> escape regardless of delay in terminal mode.
Merge branch 'master' of github.com:russell91/emacs