Vagrantfile fixes

* Better, actually working check if /etc/puppet/modules is empty
* Default to run puppet apply without --debug
Merge branch 'master' of github.com:norcams/himlar

Merge upstream