Change lock version of Pokefile.lock?
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
1) Remove kJsonSyntaxHighlighting preference.  It was just too slow.
2) Make closing windows more reliable by using a sane method.