Merge pull request #4 from bguerin/master

Tests again (and some fixes)
More puppetlint fixes