mactop adapting..
Merge remote-tracking branch 'my_fork/master'

Conflicts:
	lib/my_patches.zsh
	themes/doubleend.zsh-theme