Fixing some load_environment bugs
Merge pull request #134 from darbyfrey/load_env_fixes

Fixing some load_environment bugs