Merge pull request #210 from puppetlabs/3.2.x

Merge 3.2.x back into master
Remove recursion, this can expose sensitive information.
Merge pull request #212 from erinn/master

Remove recursion, this can expose sensitive information.
3.2.1 prep
Merge pull request #214 from mhaskel/3.2.1-prep

3.2.1 prep