Fix our Scintilla patch

It got corrupted for some reason I don't get, but it's now fixed.
Update Scintilla to version 3.3.1
Update for new Scintilla styles
Merge branch 'scintilla-update'