Merge pull request #3 from bguerin/master

Some fixes, first tests and puppet lint