Fix normalmap import and enviroment map using old variable store.

Added in a function to import normal maps as it was calling the bump map function so would overwrite its store. Updated the test for normal map to use correct version. Removed old verions of env map using a list.