Local settings
Merge branch 'local'

Conflicts:
	Package Control.sublime-settings