Specs reorganized according to Better Specs glines
Instance nethods, not class methods
type_identifier() implementation in the Link class
merge() and merge!() refactored

The merge() method's output was not truly independent, and kept affecting the calling object. This refactoring makes sure that merge() produces a deep clone and does not change the input objects.
Collection merge() specs
Merge branch 'master' into specupdate
merge! spec, currently failing
Separating contexts nested by mistake
Merge branch 'master' into specupdate

Conflicts:
	lib/occi/collection.rb
Revert "type_identifier() implementation in Link"

This reverts commit bcb27ee7f9309137569af7911cabcb1a32b1c1a3.
Merge pull request #48 from sustr4/specupdate

Yet another batch of updated specs, focusing on Occi::Collection