update files with current working env
Merge branch 'master' of github.com:sethtrain/dotfiles

Conflicts:
	gitconfig
	tmux.conf
	zshrc