Make things generally better
Merge branch 'extlookup_yaml' of github.com:grepory/puppet into extlookup_yaml
Additional changes to make things generally better