Woo, left my Git in a broken state and didn't realize it. Fixing all the mishaps.