Fix the meta tests
Merge branch 'nddata_meta' of github.com:Cadair/astropy into nddata_meta