jj is now ESC
Merge branch 'master' of https://github.com/zachfogg/.vim