linux version
Merge branch 'master' of github.com:macmata/zshrc

Conflicts:
	zshrc