Updated tmux.conf
Added puppet syntax and colors
Merge branch 'master' of github.com:pranav/dotfiles