tmuxinator
arch updates
Merge branch 'master' of github.com:stites/cfg

Conflicts:
	.bashrc
	.bashrc_tmux
	.tmux.conf