Manually merged all the conflicts between VR-Hydra branch and Master. Also
updated HydraTLayer to work with new Nunchuk code which broke it.  This
code is untested, because I do not have a Hyrda.