Fixed strange merge conflicts that got pushed into 7x branch.
Missed some text from bad merge that needed to be removed.
Merge pull request #53 from MorganDawe/7.x.schema

Fixed strange merge conflicts that got pushed into 7x branch.