Merged the main files for the GL renderer and the ray tracer. Also performed some cleanup