Merge in Clint's changes, as well as a few cookiecutter cruft cleanups