Refactor composition to be a bit more flexible.
Merge branch 'master' of https://github.com/datalurkur/Bushido-Mongers

Conflicts:
	raws/test/raws.rb