Minor fixes

This is a bunch of misc fixes that I made while looking around a bit.

I think the rename in 58af370 fixes the `python setup.py build_sphinx` issue I mentioned at https://github.com/astrofrog/wcsaxes/issues/79#issuecomment-48068928