Merge pull request #29 from webspinner/master

Adds support for inheriting options from base definitions
Continue on `function` and non-basic objects in composeMixinOptions
Merge pull request #30 from egeste/master

Continue on `function` and non-basic objects in composeMixinOptions
Adding better injection support