Use both sources of ENV from STI build
Merge pull request #218 from smarterclayton/fix_build

Use both sources of ENV from STI build