Separate Environments from Modes
Merge pull request #1293 from middleman/environments

Environments