cookiecutter template was too complex
cookiecutter template was too complex
Merge branch 'simplify'