Merge branch 'master' of https://github.com/duanewilson/massivepress

Conflicts:
	README.md
readme edits