Misc sample config updates and TODOs
Updating wordpress submodule to 3.6