Modified logic in Unit.convert to handle numpy scalars.

This PR modifies the logic in ```iris.unit.Unit``` convert method so it can handle numpy scalar types such as np.int32.

This fixes #470 and should resolve #431 avoiding the need for workaround #471.