Ensure CC & CXX get set properly
Merge branch 'master' of github.com:BluewaterSystems/package-builder