Merged VAO with Win32 branches.
Cleaned up test files.