Texture Update

Got the texture change for real this time.
Also includes the first part of the changeWater method.
Merge branch 'master' of https://github.com/j3gb3rt/Game-Jam-2014