Merge pull request #988 from iguananaut/issue-988

Add a 'Known issue' for .astropy permissions
Merge pull request #1088 from eteq/issue-983

Fix automodapi :skip: directive
Merge pull request #1089 from astrofrog/nddata/fix-allclose-import

Fix compatibility with Numpy 1.4.1
Merge pull request #1090 from astrofrog/fix-pytest-imports

Fix pytest imports
Merge pull request #1050 from mdboom/coordinates/angle-parser

Update the Angle parser
Merge pull request #1021 from ZachAstro/try2-fix-issue-809

Pull Request for 809 to Master
Merge pull request #954 from iguananaut/fits-merge

Error when storing IEEE NaN & Infinity in FITS header keywords
Merge pull request #1097 from eteq/catch-timeout-socket-errors

Catch timeout socket errors in download_file
Conflicts:

	astropy/utils/data.py
Merge pull request #1096 from mdboom/misc/ply-unicode-file-patch

PLY parsers don't load on Python 3 when the source file contains Unicode and the locale is ascii
Merge pull request #1101 from mdboom/vo/writeto

astropy.io.votable: no write_to method
Merge pull request #1104 from iguananaut/sphinx-windows-issues

Fix minor issue with build_sphinx on Windows
Merge pull request #1108 from astrofrog/wcs/fix-error-message

Fixed bug in WCS error message
Merge pull request #940 from iguananaut/issue-940

Document releasing bug fix releases
Conflicts:

	docs/development/building_packaging.rst
Merge pull request #695 from iguananaut/issue-695

Write/improve guidelines for contributing the the CHANGES.rst changelog
Merge pull request #853 from iguananaut/issue-853

Can't ignore warnings
Conflicts:

	CHANGES.rst
	astropy/units/quantity.py
Merge pull request #798 from iguananaut/issue-798

add brief discussion of sudo to install docs
Merge pull request #1109 from iguananaut/console-fixes

Console fixes
Conflicts:

	astropy/utils/console.py
Merge pull request #811 from iguananaut/issue-811

astropy 0.2 tests write to site-packages for Python 3
Bring in additional changelog entries that were added in master.
Skip a couple of the colored print tests on Windows, since it disables colors outside of IPython anyways.

Conflicts:
	astropy/utils/tests/test_console.py