The "Joe Broke It" Update

I did it again. I started developing on the master branch. Now I need to
switch to my laptop.

This update will likely break everything, so revert to something from
before if you must. I will go and cry myself to sleep in a corner
somewhere.