Revert "Revert "Merge pull request #140 from enyojs/ENYO-2313-aarontam""
Revert "Revert "Merge pull request #140 from enyojs/ENYO-2313-aarontam""

This reverts commit 848a649ce1e7728f6826499d0e8b5f00ede67336.

enyojs/layout