attempting to negate squeeze slashes
Merge branch 'master' of github.com:fergusb/zsh

Conflicts:
	zshrc