More on unit.py, update from inasafe-dev.