...
From a clean VM (if you need one, I have a few to spare), run the puppet install steps to the point before you have to download avalon-installer-flat. Instead of downloading the flat, clone the git repository and initialize the submodules. Changes will have to be made, let's make those changes easy to track and push back up! --Make your own branch please--
...