Merge pull request #391 from tzz/master

Fixes and S3 deployment sketch
s3deploy: minor adjustments
Merge branch 'master' of github.com:cfengine/design-center