update wp to 4.0.1

Conflicts:
	wp
Merge pull request #77 from Granitech/upstream

update wp to 4.0.1
Merge branch 'master' of github.com:markjaquith/WordPress-Skeleton

* 'master' of github.com:markjaquith/WordPress-Skeleton:
  update wp to 4.0.1