Major refactoring of some Apache labs
Major refactoring of some Apache labs

This commit has several large changes to the apache labs in order
to make them feed off each other better and flow better for the course.
What you don't see in the slides is the exercises manual we hacked up
in a google doc for tomorrows course.

petems/puppetlabs-training-bootstrap,marrero984/education-builds,marrero984/education-builds,carthik/puppetlabs-training-bootstrap,wbhamilton/puppetlabs-training-bootstrap,klynton/puppetlabs-training-bootstrap,samuelson/puppetlabs-training-bootstrap,johnduarte/puppetlabs-training-bootstrap,samuelson/education-builds,marrero984/education-builds,carthik/puppetlabs-training-bootstrap,carthik/puppetlabs-training-bootstrap,samuelson/education-builds,klynton/puppetlabs-training-bootstrap,kjhenner/puppetlabs-training-bootstrap,joshsamuelson/puppetlabs-training-bootstrap,johnduarte/puppetlabs-training-bootstrap,wbhamilton/puppetlabs-training-bootstrap,joshsamuelson/puppetlabs-training-bootstrap,klynton/puppetlabs-training-bootstrap,samuelson/puppetlabs-training-bootstrap,petems/puppetlabs-training-bootstrap,kjhenner/puppetlabs-training-bootstrap,samuelson/education-builds,puppetlabs/puppetlabs-training-bootstrap,kjhenner/puppetlabs-training-bootstrap,wbhamilton/puppetlabs-training-bootstrap,johnduarte/puppetlabs-training-bootstrap,petems/puppetlabs-training-bootstrap,samuelson/puppetlabs-training-bootstrap,puppetlabs/puppetlabs-training-bootstrap,puppetlabs/puppetlabs-training-bootstrap,joshsamuelson/puppetlabs-training-bootstrap