Apply common scaffold files and configurations#55

jeremyfelt wants to merge 2 commits intotrunkhappyprime/atvp.org:trunkfrom

scaffold/apply-common-scaffoldhappyprime/atvp.org:scaffold/apply-common-scaffoldCopy head branch name to clipboard