Backwards compatibility with master branch.

Parameterize the changes in pillars so we can have machines with
different configurations coexisting.  As a side benefit of doing
it this way, we should be able to change the configuration of
specific machines on the fly.