- Sublime 2 Package updates
- Added nvm config to .zshrc
Merge branch 'master' of gh-alpha:neiljdo/dotfiles

* 'master' of gh-alpha:neiljdo/dotfiles:
  - Sublime 2 Package updates - Pulled recent oh-my-zsh into fork
  - Sublime package updates - New aliases - Updates to .hgrc and .zshrc - Merged oh-my-zsh fork with latest master

Conflicts:
	.config/sublime-text-2/Packages/User/Color Highlighter/themes/Monokai Extended Bright.tmTheme
	.config/sublime-text-2/Packages/User/Preferences.sublime-settings
	.zshrc