Merge pull request #291 from puppetlabs/modulesync