Enabled mercurial oh-my-zsh plugin
Merge branch 'master' of gh-neiljdo:neiljdo/dotfiles

* 'master' of gh-neiljdo:neiljdo/dotfiles:
  - Sublime package updates - Updated oh-my-zsh fork with latest upstream master

Conflicts:
	.zshrc