Removed unused VSExtension and fixed some merge issues in the Powershell.csproj