Merge pull request #1 from thecountchuckula/master

I would like to update my fork
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Texture things

as well as some code that works but doesnt have textures working so
please dont uncomment it unless you add textures.
Merge pull request #7 from darkevilmac/master

Stuff