fixing various issues with cshell setup script
Merge branch 'fix-setup-csh'