Merge pull request #352 from mauler/master

Adds OPPS_CHANNEL_LAYOUT configuration
Revert "Adds OPPS_CHANNEL_LAYOUT configuration"
Merge pull request #353 from opps/revert-352-master

Revert "Adds OPPS_CHANNEL_LAYOUT configuration"