Prep for the next round of development

Testing Done:
Ran `ninja dist`

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