It is a shame how much I suck at spelling.
Merge branch 'master' into OculusDisplay
Cleanup remains from the rename of opengl-programming-guide