General cleanup and updated to OpenGL 3.2
Files Git refused to commit!?!