Simplified server provisioning

Not yet complete. Most TODOs are inline.

This will resolve #417.
OS