double numSkylights on line 3447 is the only thing that uses it and nothing uses numSkylights currently, so both can be taken out. That said, if there is a reason to leave them in the code as unused variables then that is a different story and I can put it back in.

I merged in the latest develop and compiled, there are no conflicts or errors.