Simplify puppet::module, stick to version
Rename stdlib module
Merge pull request #296 from njam/issue-296

Make sure "puppet module upgrade" doesn't fail so often