Merge pull request #2450 from mdboom/config/fix-cfg-template

Move top-level config items to top of file.
Merge pull request #2452 from mdboom/unit/vounit-extra-spaces

Remove the extra space in VOUnit output
Fix pep8 compliance and reword the assertions in the tests, as suggested during code review.
Fixing documentation links and warnings in cosmology
improve printwcs, add a test
Merge pull request #2444 from bluescarni/bugfix-for-issue-2401

Tentative fix for issue #2401
Small heading link fix
Fix slow down in Angle.__new__
Merge pull request #2456 from bsipocz/fix_cosmology_docs_links

Fixing documentation links and warnings in cosmology
Update CHANGES.rst

Moved this from the wrong section.
Recify 54ed32c1c3c1e16de34a212d5621fe824746af3b which was written before 92aab898f9ea64bac1dfc64531af7346e48213e8--the __repr__ and __str__ still relied on the SIP and InverseSIP models being based on the composite model class which is no longer the case.
Merge branch 'master' of github.com:astropy/astropy
Merge pull request #2458 from mdboom/coordinates/fix-slowdown

Fix speed regression in Angle.__new__
Adds a kinda hacky way to skip doctests on Windows only; later a better way to do this would be to use markerlib or something like that.  This test is not expected to pass on Windows due to unavailability of in-place sorting.
Work around a strange bug that can occur on Windows with pathological array dimensions.  Not interested in trying to find out more about what's going on here unless someone brings up a real world occurance of this bug.
*Possible* fix for #2318.  Not sure if this will fix @cdeil's specific issue, but it *did* fix the issue for me running on my laptop on the institute network.
Ensure better consistency between OSes here by using a file:// url
Add rows kwarg to Table init for row-oriented data
Add initial tests of row initialization
Handles an issue on Windows only for Python 3.3 and up, where trying
to pass filenames as bytes to certain system calls results in a
DeprecationWarning (and maybe an error in later Python versions).

An earlier fix I had for this actually made a few attempts to decode the
bytes string.  But really, user code should not in general be passing
filenames as bytes in the first place, so I think this simpler fix is better
for now.