settings++
Merge branch 'master' of github.com:robhurring/dotfiles

Conflicts:
	other/st3/User/SublimeLinter.sublime-settings