changed some variable names, did some minor cleanup.  Committing to ensure that I can merge with the new directory structure.
Merge branch 'master' of https://github.com/EmbodiedCognition/QtVR