Run Puppet twice during lavender box stage

This should be safe to do (yay idempotency), impose minimal overhead,
and potentially make our deployments a bit more resilient to race
conditions.
Increase timeout on WaitConditions to 15 minutes
Merge pull request #61 from huit/feature/puppet-double-tap

Feature/puppet double tap