shit was blowing up.
Merge pull request #1 from jonjchew/env-setup-fixes

shit was blowing up.