Greatly simplify the test to see if we should skip the building of a module.  Also fix rebuild_world script