This is a tricky one.  The actual place where we want users to import `astropy.wcs.wcs.WCS` from is `astropy.wcs.WCS`, but the documentation generates it for its "real" location.  I know that there's some work going on to fix this problem in #1826 and elsewhere...

@eteq: Since you're much more involved with all this than I am, can you comment?  Would it make sense for @krngrvr09 to hold off on this for now until #1826 is resolved.  I'm just worried if we make this change now, we'll just have to change it back to what we really want it to be later...