Fix makefile rules for out-of-source shell scripts
Wow, that was stupid of me.
Fix broken Environment test
Merge pull request #54 from dmcdougall/fix_tests

Fix tests