Merge pull request #38 from webspinner/master

Bring this up to date with newest needs
Extend base definition mixinOptions when inheritMixins is true

Addresses #39
Merge pull request #41 from egeste/master

Extend base definition mixinOptions when inheritMixins is true
Update Contributing File