update dotfiles
Merge branch 'master' of github.com:iphilgood/dotfiles

Conflicts:
	zshrc