7.x grammar fixes
Merge pull request #17 from daitken/7.x

7.x grammar fixes
Merge branch '7.x' into 7.x-code-review

Conflicts:
	includes/utilities.inc
Merge pull request #2 from nigelgbanks/7.x-code-review

7.x code review