Fix stuff
Merge branch 'master' of github.com:andsens/sublime-text-2-settings

Conflicts:
	SublimeLinter.sublime-settings