Work on new VSIX installer.
Fix NRE.
Merge commit '4b240d1111391290651d220227ad4ec623b17e58' into Highlighting