Merged makefiles, and reformatted long lines.