Update 7.x
update uninstall so it does not remove associated cmodel or collection object
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_collection into 7.x
Merge pull request #1 from ppound/7.x

7.x
coder cleanup
Merge pull request #2 from DannyJoris/7.x

coder cleanup
used the new callback functions in the install hooks - moved the collection root object away from the collection sp module
added a DS-COMPOSITE-MODEL datastream to the content model object
removed redundant module key
coder cleanup
Merge pull request #3 from DannyJoris/7.x

7.x
Merge pull request #4 from DannyJoris/7.x

7.x coder cleanup + remove key
Added permissioning
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_collection into 7.x
Merge pull request #5 from ajstanley/7.x

7.x
Added additional permission checking
Merge pull request #6 from ajstanley/7.x

Added additional permission checking
Alter to use new hook structure.
Update documentation and use renamed hook.
Squash hook_islandora_type_info().