Branch/new terrain

@eric79 Should we merge this or discard it? One of the two should happen, I think.