Refactoring of the demo stuff.
Merge branch 'master' of https://github.com/derickr/3angle