Added some support for puppet librarian, not tested yet
And more tweaking to vagrant files.