Updated Spire tag to 0.3.1.

0.3.1 includes proper GL resource cleanup.
Merge branch 'master' into spire.

Keeping origin/master.
Conflicts:
	src/CMakeLists.txt