Fix Makefile to include all scripts
Removing CM setting from caroline build machine