swap esc and caps
Merge branch 'master' into laptop-1-external
Show battery stats in tray.