[refactoring] Cleaning up.
Merge branch 'sdl' of github.com:hhirsch/glPortal into sdl