update wp to 4.0.1

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

update wp to 4.0.1
Update to WP 4.0.1
Revert "Update to WP 4.0.1"

This reverts commit 829f6b326ac2b547527323db273188e2642b59c2.
Renaming README.md for merge with WP-Stack