Adding some quotes for better handling of unset variables
Remove extraneous reference to CGM repo
Merge pull request #118 from svalinn/build_script_fix01

Build script fix01