Merge pull request #22 from rackerjoe/work

Merged automatically by jenkins after successful build test
Merge branch 'master' of https://github.com/rcbops-cookbooks/cinder into rsyslog