Add Component.merge tests to ComponentGroupTests
Implement Component.merge
Reorder prepend and not-prepend for clarity
Code cleanup as suggested by JLan
Merge pull request #200 from palantir/component-merge

Component merge