Make all environments available from modules.
Merge pull request #1820 from rwjblue/make-all-environments-available

Make all environments available from modules.