Initial next-gen build. Still a mess.
Merge branch 'master' of github.com:noppe/build_puppet