Clean up writers
Merge branch 'master' of github.com:dallingham/regenerate