Personally I screwed up with upgrading too 3.1. I thought I had future proven everything by testing against trunk, but no I forgot one single file that preloaded certain WordPress files which broke a couple of things. #facepalm