Make sure location_for is used when installing Puppet.
Merge pull request #233 from apenney/add-back-location

Make sure location_for is used when installing Puppet.