Add a pillar and use it to specify users
Move around config values to make more sense
Rename dh2048.pem to dh.pem