Edit alias
Edit tmux color, status
Merge branch 'master' into work-separate-boxen