added Tmux and OhMyZsh
Merged changes