Stuff from mac
Merge branch 'master' of github.com:zolitch/sublime-packages

Conflicts:
	Installed Packages/LiveStyle.sublime-package
	Packages/SublimeCodeIntel/package-metadata.json
mac update. just deleted lifestyle