Merge pull request #1154 from immortius/develop

Fixes from gestalt-module integration
Switched to gestalt-module 1.2.0
Fixed asset resolvers.
Merge pull request #1157 from MovingBlocks/fix-asset-resolvers

Fixed asset resolvers
Updated to use gestalt-module 1.2.1 with fix for OSX