Updated the mixins to incorporate the new mixins used on later projects
Cleaned up environment sendOrRender method and extends Object.merge