refactor for theming
clean up xml & compenstate for cmodel naming consistency across solution packs
finish refactoring
working in FF & Chrome now.
address https://github.com/Islandora/islandora_solution_pack_video/pull/31#discussion-diff-3624698
address https://github.com/Islandora/islandora_solution_pack_video/pull/31#discussion-diff-3624938
address https://github.com/Islandora/islandora_solution_pack_video/pull/31#discussion-diff-3624989
address https://github.com/Islandora/islandora_solution_pack_video/pull/31#discussion-diff-3625042
address https://github.com/Islandora/islandora_solution_pack_video/pull/31#discussion-diff-3625134
address https://github.com/Islandora/islandora_solution_pack_video/pull/31#discussion-diff-3625144
last of first round of addressing comments in PR 31
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
Merge pull request #31 from ruebot/7.x-theme

7.x Refactoring and metdata display (theme)
strip  - not necessary.
Merge branch '7.x-theme' into 7.x
Merge pull request #33 from ruebot/7.x

Strip out $token
added new tests and fixtures