Added UOM for viral load activity report, removed uom from viral load select list options

https://www.pivotaltracker.com/story/show/74742984
Merge pull request #298 from pfschwartz/oe4.1.1

Added UOM for viral load activity report, removed uom from viral load se...