Updated plugins and mapped Esc key to jk
Merge remote-tracking branch 'origin/master'