Cleaned up errors in PolicyGenerator.java (which is now deprecated) and FourRooms.java and TaxiWorldDomain.java (this file had unresolved merge conflicts).