Updated with work laptop config.
Merge branch 'master' of github.com:alexgorbatchev/sublime-config

Conflicts:
	Package Control.sublime-settings