cleaned up the mapper a bit

Change-Id: I1033f6abfd15e62de55a10e39dac2bff95796ba1
Merge branch 'opengl2-rendering' of https://github.com/cryos/VTK into opengl2-rendering

Change-Id: I290af0cf26b0fbdcdce7875fae02d07040f4e2de