Remove scaffolding references, update PHP version
Merge pull request #1182 from bcrowe/3.0-rm-scaffold

3.0 - Remove scaffolding references, update PHP version