Merge multiple attributes files and make sure the nginx attributes are documented as using knife cookbook doc attributes
Regenerate README
Bump the version in preparation for release
Record a few more changes