Cleanup, and rename attributesFor to generate
Merge pull request #314 from GrahamCampbell/renaming

Rename attributesFor to generate, and cleanup