Remove some const declarations; these lead to compiler errors with IBM's compiler on the Blue Gene/Q
Handle merge conflict
Use CCTK_ macros instead of LC_ macros for looping
Do not generate integer constants

Do not generate integer constants; this may fail if they are arguments to two-argument functions (e.g. pow) with some C++ compilers.