Clean up some of my experimental stuff
Merge branch 'master' of github.com:jimrthy/glfw