Remove dependency on stdlib4

This removes the backwards incompatible change between 3.0.x and 3.1.x.
Merge pull request #197 from mhaskel/remove_stdlib4

Remove dependency on stdlib4
Merge branch '3.1.x' into test
Fix for puppet 3

This was failing on puppet3.
Merge pull request #198 from mhaskel/test

Merge 3.1.x into master