Adding PER_DIRECTORY_HISTORY_DEFAULT_GLOBAL_HISTORY, so if set then global history is the default.
Modified candy-egbomrt theme
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

Conflicts:
	plugins/per-directory-history/per-directory-history.plugin.zsh