Corrections to Scaffolds
Fixed Issue #17
Package update
Name Conventions on collections
Fix Issue #18
Nuspec update
Merge branch 'master' into 1.4