Merge pull request #2053 from barentsen/bugfix-for-wcs-validate

wcslint and wcs.validate raise an unexpected NameError exception
Conflicts:

	astropy/wcs/wcs.py
Merge pull request #2076 from pllim/vo-fix-neg-RA

Added check for RA with negative zero in Cone Search.
Merge pull request #2073 from mwcraig/fits-unicode

Make s couple of strings into unicode
Conflicts:

	astropy/io/fits/diff.py
Merge pull request #2074 from mhvk/time-scale-conversions

Correct TCG->TDB conversion; add regression tests
Conflicts:

	CHANGES.rst
Merge pull request #2023 from krngrvr09/fits

Improved error message for scale units in FITS.
Conflicts:

	astropy/io/fits/connect.py
	astropy/io/fits/tests/test_connect.py
Merge pull request #2081 from taldcroft/time-operand-err

Fix / improve error message for comparisons
Merge pull request #2084 from lgarrison/patch-2

Documentation fix
Conflicts:

	astropy/cosmology/funcs.py
Merge pull request #1895 from lpsinger/all_world2pix_doc

Move documentation for `tolerance` parameter to correct function
Merge pull request #2088 from mdboom/testing/commandline-help

Clean up `setup.py test --help`
Merge pull request #2097 from mdboom/wcs/read-out-of-bounds

Fix read out of bounds error in `wcs`
Merge pull request #2016 from larrybradley/kernels

CustomKernel fixes
Merge pull request #2099 from astrofrog/hdf5/fix-windows

HDF5 I/O tests fail on Windows 7 Anaconda installation
Merge pull request #2104 from luzuku/Issue-#1522

Printing columns with shape (n,1,…,1). Fixes #1522
Merge pull request #2106 from mdboom/wcs/propagate-error-message

Propagate error message correctly in wcs pipeline
Conflicts:

	CHANGES.rst
Merge pull request #2070 from mdboom/unit/fractional-powers

Fix rounding errors with fractional powers.
Merge pull request #2038 from larrybradley/gauss2d

Fixed Gaussian2D model
Conflicts:

	astropy/modeling/functional_models.py
Merge pull request #2050 from mdboom/testing/single-rst-file

Make `setup.py test -t` option work for .rst files
Conflicts:

	docs/development/testguide.rst
Merge pull request #2012 from mdboom/testing/doctests-ignore-32bit

Ignore differences between 32-bit and 64-bit ints
Conflicts:

	astropy/tests/pytest_plugins.py
Merge pull request #2117 from pllim/fix-config-set-temp

ConfigurationItem set_temp() now resets properly on exception