accumulated changes
Merge branch 'master' of github.com:dpfried/config

Conflicts:
	zshrc