merging Johns renderManCoshaders branch