Updated PackageControl, SublimeLinter, etc.
merge
Fixed conflict