Vanillalite
Ask me about the GAF Notebook
Dammit.
So I found out why the OTA wasn't installing. After being tired of waiting for the OTA to pop up again (after it failed twice last time, which I assumed was because I had a custom recovery) I tried ADB sideload.
During installation it complained about something related to an unexpected velvet.apk. This is because Google disabled Google Now so there's a hack which involves rooting, replacing google search with an earlier version, setting up Google Now and then updating through the store.
Anyway, I'm fucked.
Factory reset and update?