I am seeing the EXACT same problem on my board, too. I have the same firmware version and last year’s OSPi hardware (July 2013)
After I got into the mess above, I tried re-pulling the code cleanly (copied over this merged mess to a separate directory and re-creating the OSPi from a git clone) and then dropping in snames.json and options.txt from my old install, but that failed miserably. Completely down now.
Help!