Added error handling to build_dungeon
Added error handling to merge_dungeon()
Merge branch 'master' of github.com:mikewideman/erlangmud