Reintroduced __build() and scaffolder writing.  Model can now use this.

This also adds the initial scaffolding for controllers, although not much there.
Merge branch 'master' into website