misc local
Merge branch 'master' of github.com:tylercoville/dotfiles

Conflicts:
	go/env.zsh
	maven/alias.zsh
	tmux/tmux.conf.symlink