Update some settings and add two new js snippets.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Package Control.last-run
	Package Control.system-ca-bundle
	Preferences.sublime-settings