Merge branch 'master' of github.com:thejandroman/base-vagrant-librarian-puppet
Merge branch 'master' of github.com:thejandroman/base-vagrant-librarian-puppet