Improve test coverage in astropy.units.  Fix some bugs discovered along the way.
Fix test after rebase
Merge pull request #1405 from mdboom/unit/coverage

Improve astropy.units test coverage