Refactored provisioning.

The provisioning was a little buggy and unreliable. I made things
better, but would still prefer to have them as puppet files.