Add tmux battery
Merge branch 'master' into linux
Add tmux-resurrect
Merge branch 'master' into linux