provisioning cleanup

- cleaned up differences between cloud and infra
- got rid of unneeded comments, generally made code more readable
- put in comments about the brokenness of the cloud tests, so someone else
  can take on the challenge if they so desire
Merge pull request #559 from seandst/provisioning-refactor

provisioning cleanup