Modified logic in Unit.convert to handle numpy scalars.
Merge pull request #472 from esc24/convert_np_int32

Modified logic in Unit.convert to handle numpy scalars.