Merge branch 'utf8_pizza' of github.com:pfmoore/cookiecutter
Merge branch 'master' of github.com:audreyr/cookiecutter
Revert "Merge branch 'utf8_pizza' of github.com:pfmoore/cookiecutter"

This reverts commit 6397dccd7523e7569379cadefbfc97bd4c477859, reversing
changes made to 99b7bd9f5a4c6368c555adefd5fc9c40e60346ae.