Merge branch 'hotfix/puppet/fixture_typo'
Merge branch 'release/0.0.4'
Use the Find module to locate ERB files
Version bump: 0.0.4.1
Merge branch 'hotfix/0.0.4.1' into develop