Further fixed instr/iris/iris.py and some more Map imports to please Travis.