Merge pull request #1949 from taldcroft/ascii/uni-lit

Allow passing unicode delimiters in io.ascii read and write
Merge pull request #1965 from adrn/docs-typo

Fix minor typo in coordinates docs
Merge pull request #1897 from embray/msys-home

Better support for $HOME in msys shells on Windows
Merge pull request #1961 from ryanfox/wrap-angle-pickling

Fix for #1942.  Added pickling test class for coordinates as well
Merge pull request #1981 from mdboom/wcs/lattyp

Rebase of #1463
Merge pull request #1982 from mdboom/misc/did_you_mean_fixes

Fix did_you_mean so it's properly case-insensitive
Merge pull request #1984 from mhvk/longitude-pickle-changes

CHANGES.rst entry for #1961 (Longitude keeping wrap_angle)
Merge pull request #1923 from joergdietrich/patch-1

Fix typo in doc string
Merge pull request #1989 from eteq/angleemptysepstring

Allow `sep` on `Angle.to_string` to be empty
Merge pull request #1991 from taldcroft/ascii-names

Fix problem with names arg colliding with existing names
Conflicts:

	astropy/io/ascii/tests/test_read.py
Merge pull request #1917 from mwcraig/fix-1761

Add len() to coordinates
Conflicts:

	CHANGES.rst
Merge pull request #1915 from nden/error-fit-composite

Error fit composite
Conflicts:

	CHANGES.rst
Merge pull request #1892 from mwcraig/patch-5

Fix typo in doctest
Merge pull request #1996 from eteq/update-overview-affiliated

Update overview discussion of affiliated packages
Merge pull request #2004 from eteq/test-path-no-doctests

don't run doctests when -t option given
Conflicts:

	astropy/tests/helper.py
Merge pull request #2007 from adonath/fixing_issue_#1986

Fixing #1986 and a few other minor issues
Conflicts:

	astropy/convolution/core.py
Merge pull request #1912 from barentsen/fix-issue-1912

WCS.footprint_to_file() is broken
Conflicts:

	astropy/wcs/tests/test_wcs.py
Merge pull request #2002 from mdboom/vo/volint-unicode

Encoding error when using volint
Merge pull request #2017 from astrofrog/fix-argparse-31

astropy.utils.compat.argparse not working for Python 3.1
Conflicts:

	CHANGES.rst
	astropy/utils/compat/argparse.py
Merge pull request #2014 from eteq/add-shape-to-coords

Add `shape` to coordinates