tmux env
Merge branch 'master' of github.com:meiraka/local

Conflicts:
	etc/tmux/status.py