Merge pull request #1510 from mdboom/tests/six

Update astropy.tests to use six instead of 2to3
Add a system whereby collections of units can be enabled after the fact.
Remove imperial units from examples
Fix documentation typo
Add astropy.units.imperial.enable
Add examples to add_enabled_units_context