turning off history setting
Merge remote-tracking branch 'mine/master-mine' into mine-master

Conflicts:
	lib/history.zsh