Updating puppet configuration

Getting closer to having the whole thing bootstrappable via pupper
Various changes