Prepare for the next round of development

Testing Done:
Ran `make distcheck`

Reviewed at https://reviews.imfreedom.org/r/1048/