Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop
Corrected typo where 'years' was listed as a units abbreviation instead of 'yr'
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop
Merge pull request #159 from mgage/develop_unit_fix

Develop unit fix