Fixes for #38, #39: Merging gitinstall.sh and install.sh scripts