Copy water and lava from Eriador

fixes #16 and fixes #17