Allow 's' to be used on the end of unit aliases

This is a quick and lazy way of allowing people to use the plural form
of most unit names without adding a seperate entry for each unit to the
database. Also adjusted some units slightly.