server updates
Merge https://github.com/earthlinkdesign/cdk-stone