Missed the fix Ben made to this on the merge, so changing it.
Merge ben into this branch
Quick fix things
textures
No more artifacting issues, but I don't know why.  Tests with buffer size of 10 and 1000 had no issues.  After switching back to 100 issue no longer existed.  Made minor changes for tranformations and draw calls, but nothing had an effect until after I adjusted buffer sizes.
tex
terrain tex
Merge branch 'master' into peter
grid_height
texture
textures
Score tracking and player ids implemented.
Merge branch 'master' into peter
textures
tex
Name tracking cleaned up.  Readable names now after adjustment to be::Id.
Merge branch 'master' into peter
Merged and playable
audio stuff, editor stuff
fixed josh's fubar