Merge with Cameron's opengl layer.
Merge branch 'master' of https://github.com/sparks/rter