fix which shell to use
Merge remote-tracking branch 'origin/master'
drop -f option from readlink so that it works on a mac