Misc. changes

- clean up of VertexArray & BufferObject
- consitent header guards