blaaargh
Merge branch 'master' of github.com:martijnvandijk/dotfiles

Conflicts:
	sublime3/Installed Packages/AdvancedNewFile.sublime-package
	sublime3/Installed Packages/Django Manage Commands.sublime-package
	sublime3/Installed Packages/Git.sublime-package
	sublime3/Installed Packages/Theme - Cobalt2.sublime-package