Move CONTRIBUTING.ms and LICENSE.txt back to root of repository.
Second attempt at fixing infinite loop when mapgen can't find anywhere to put a staircase.
Nuke some accidentally merged debug messages.
Merge some small bugfixes