Commented out setting term in tmux; things were breaking on server.
Merge branch 'master' of github.com:rykugur/dotfiles