Various fixes to scaffold and resource generators
Merge pull request #118 from dockyard/bc-ensure-proper-resource-and-scaffold-generation

Various fixes to scaffold and resource generators