st
Merge branch 'master' of github.com:kek/config

Conflicts:
	sublime-text/Installed Packages/ERB Snippets.sublime-package
	sublime-text/Packages/GitGutter/package-metadata.json
	sublime-text/Packages/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	sublime-text/Packages/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	sublime-text/Packages/User/Package Control.last-run