Updating to WordPress 3.6

I just updated all the files, you can merge this into the primary branch and it will bring everything up to date.