Refs #5029 - specify inital org and location
Merge pull request #97 from jlsherrill/updates

Update puppet modules