Update tmux.conf based on the tmux book
Update oh-my-zsh submodule
Merge branch 'master' of github.com:jdavis/dotfiles