Fix the bootstrap script run by fabric on puppet deploys.

This makes it idempotent.
It also means that puppet will actually run without errors.