Merge branch 'master' of ssh://github.com/pmeth/opencfp
Merge remote-tracking branch 'chartjes/master'
adding some dependency declarations to the puppet manifest so vagrant up will work properly
Merge pull request #8 from pmeth/puppet_fixes

Puppet fixes