s
Merge branch 'master' of https://github.com/ostlund/dotfiles

Conflicts:
	sublime-text-3/Installed Packages/JavaScript & NodeJS
Snippets.sublime-package
	sublime-text-3/Installed Packages/JsFormat.sublime-package
	sublime-text-3/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	sublime-text-3/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	sublime-text-3/Packages/User/Package Control.last-run