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

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

Conflicts:
	includes/derivatives.inc
	islandora_video.info
	islandora_video.module
Follow Coder/CodeSniffer coding standards.

Moved theme preprocess function to theme.inc

Changed some function headers to be more descriptive or to match
existing examples for consistency.
Merge pull request #1 from nigelgbanks/7.x-code-review

7.x code review