Martell developer

Updates to Makefiles and address chance to Cstar reference line in Gmacs.tpl