MASTER  - Bug fixes for linux compilation
        - Attempt to fix oculus rift code