Merge pull request #1 from picklesdoc/master

Update from Original
Revert "Fix for feature not rendering correctly"

This reverts commit 69eeb63a8fa9974e2a8540a496ff24ec3d839e9c.
Merge pull request #116 from seanfitzg/master

Revert "Fix for feature not rendering correctly"
Rezipped up Source to reflect changes
Merge pull request #119 from aaronjrich/master

Rezipped up Source to reflect changes for #118
remove target pack from build, and exclude *.pdb
Remove target merge from build
Remove reference to nuget
Version bump
Merge branch 'master' into release