modifications
Merge branch 'master' of github.com:neagle/environment

Conflicts:
	dotfiles/tmux.conf
	dotfiles/zshrc