Merge pull request #35 from claco/master

Merged automatically by jenkins after successful build test
Add more flexibile config templating

Moved this over from swift-private-cloud.

Partial fix for rcbops-cookbooks/swift-private-cloud#179
Merge pull request #36 from rpedde-rcbops/issue-179

Merged automatically by jenkins after successful build test