Sublime package updates
Merge branch 'master' of gh-neiljdo:neiljdo/dotfiles

* 'master' of gh-neiljdo:neiljdo/dotfiles:
  - Added setting of $DJANGO_SETTINGS_MODULE_TEST environment variable - Testing-related aliases - Sublime packages updates

Conflicts:
	.config/sublime-text-2/Packages/Monokai Extended/Monokai Extended Bright.tmTheme