Added tmuxinator support
Merged tmux changes