Update timeout time to new default value.
Removed unneeded Event
Merge remote-tracking branch 'origin/master'
Fixed the surge.yml header.
More Spigot -> Surge.
Removed useless spam.
Merge remote-tracking branch 'upstream/master'