Remap leader/esc keys
Merge branch 'master' into laptop