Branch that slowcord.maddy.k.vu runs. Generally up to date with master, also contains my fixes/etc that aren't yet merged.