Fixing issue with nested dir mixins using incorrect object key
failing test for nested mixins
Merge branch 'sorensen-master'

* sorensen-master:
  Fixing issue with nested dir mixins using incorrect object key
build demo files and run tests after merging #28