7.x grammar fixes
Removed periods for consistency
fixes to plurals
Merge remote-tracking branch 'dan/7.x' into 7.x

Conflicts:
	includes/derivatives.inc
	tests/hocr.test
Merge pull request #24 from Islandora/7.x-rename

7.x rename