- Sublime package updates
- oh-my-zsh submodule updates
Merge branch 'master' of https://github.com/neiljdo/dotfiles

* 'master' of https://github.com/neiljdo/dotfiles: (40 commits)
  Sublime Package updates
  Added alias for runserver with no fixed host:port value
  Updates to oh-my-zsh
  - Added anaconda plugin - oh-my-zsh submodule now refers to latest master
  - Updates to sublime preferences - Disabled branch.autosetuprebase gitconf
  pyenv support
  Sublime package updates
  Sublime package updates
  - Added setting of $DJANGO_SETTINGS_MODULE_TEST environment variable - Testing-related aliases - Sublime packages updates
  Sublime Package updates
  New Sublime packages
  Added alias for `git fetch`
  New sublime packages + Fabric-related aliases
  Sublime package updates
  Sublime package updates
  Sublime package updates
  - AngularJS sublime package - GitGutter sublime package - JSHint sublime package - updated .aliases
  Untracked PyV8/linux64/config.json
  Dotfiles Syntax Highlighting updates
  Added CursorRuler, Git, and GitGutter packages
  ...

Conflicts:
	.config/sublime-text-2/Packages/PyV8/linux64/config.json
	.config/sublime-text-2/Packages/User/Preferences.sublime-settings