sublime package update
Merge branch 'master' of github.com:mortik/dot-files

Conflicts:
	sublime/Package Control.sublime-settings