Some preliminary changes

Added a new type of water, and a new helper class that converts bumpmaps
into normalmaps