Merge pull request #2 from Islandora/7.x

7.x updates
7.x binary tests
Merge branch '7.x' of https://github.com/daitken/islandora_solution_pack_image into 7.x
Merge branch '7.x' of github.com:qadan/islandora_solution_pack_image into qadan-7.x
Remove conditional test.
Coding standards.
Merge pull request #57 from jordandukart/7.x-qa-dan

Update tests to new IslandoraCollectionWebTestCase standards.