Ensure that features can be enabled via config/environment.
Merge pull request #958 from rjackson/ensure-features-can-be-enabled

Ensure that features can be enabled via config/environment.