All changes included except point 9 - zip file inclusion
Merge pull request #11 from bazaarvoice/DotNet-Upgrades

All changes included except point 9 - zip file inclusion