Merge pull request #54 from billlutton/mergeall3

Fix Vixen.csproj bad merge checkin (builds now)