Fix env script names
Merge branch 'fish' into xdissent