Merge remote-tracking branch 'SublimeLinter/master'

Conflicts:
	linter.py