Use WordPress 3.6 branch as submodule
Rename 'wp' to 'wordpress'
Remove submodule to fix broken state
More submodule fixing
Now we finally have the submodule properly tracking 3.6