Refactor wcs to use six
Merge pull request #1411 from mdboom/wcs/six

Refactor wcs to use six