Update submodules to where Joel has been hacking on them