remove multivalued map, clean up dependencies

Change-Id: Ic7f4ad1ee66c738ef4e25d199dad6a004f1efa6b
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>
Merge branch 'master' of git@github.com:UnitConversion/unitConv.git

Conflicts:
	src/main/java/org/bnl/gov/unitconversion/Device.java
	src/test/java/org/bnl/gov/unitconversion/DataTypeTest.java

Change-Id: Id0197236279c8557264112b96f83a22d7d48f2c4