Move astropy.image code and docs code into correct location
Fixes to reflect merging into astropy core