Removed Terrain.java.orig that had made it in at some point