Scaffolding Improvements#486

LukeTowers merged 13 commits intowip/1.2wintercms/winter:wip/1.2from

wip/1.2-improve-scaffoldingwintercms/winter:wip/1.2-improve-scaffoldingCopy head branch name to clipboard