Re-order headers to make GLEW happy.
Merge branch 'master' of https://github.com/SCIInstitute/spire