Clean up setting the environment
Merge branch 'master' of https://github.com/philipbrown/worldpay