Let's keep branches here tidy and obvious. Might even rename `clean` to `master` once everything is synced up around it.