Merge pull request #31 from fatcerberus/master

Scintilla upgrade