README update
Merge branch 'master' of https://github.com/philhoyt/Generic_WP_Framework

Conflicts:
	README.md