Enhance the VSIX package creation tool to better support Visual Studio 2013.
Merge updates from trunk.
Update the template VSIX package file as well.
Merge updates from trunk.