Back to development: 0.2.5
Merge pull request #1288 from mdboom/unit/handle_exceptions_in_parser

Another unreadable VO table: unit parsing failure
Merge pull request #1098 from mdboom/misc/travis-test-with-ascii

Set locale to C on Travis
Conflicts:

	.travis.yml
Merge pull request #1291 from Xarthisius/console_fix

Sanitize the value of COLUMNS passed to terminal_width
Conflicts:

	astropy/utils/console.py
Merge pull request #1308 from vterron/master

Add missing verb ("is")
Merge pull request #1317 from vterron/master

Fix misspelled word ("Deletetion")
Merge pull request #1319 from astrofrog/coordinates-fix-angle-formatting

Fix formatting of Angle objects when precision=0
Conflicts:

	astropy/coordinates/angle_utilities.py
Merge pull request #1323 from astrofrog/coordinates-fix-decimal-formatting

Fix decimal formatting for Angle objects
Conflicts:

	astropy/coordinates/angles.py
	astropy/coordinates/tests/test_angles.py
	astropy/coordinates/tests/test_api.py
	astropy/coordinates/tests/test_formatting.py
Merge pull request #1332 from embray/fits-comp-unhandled-exception

Fix unhandled exception in astropy.io.fits.compression module
Merge pull request #1337 from mdboom/vo/warn_about_no_resource

Warn when a VOTable 1.2 file contains no RESOURCEs
Conflicts:

	astropy/io/votable/exceptions.py
	astropy/io/votable/tree.py
Merge pull request #1347 from mdboom/table/html_table_escape

Escape the text in Table's HTML output
Conflicts:

	astropy/table/tests/test_pprint.py
	astropy/utils/tests/test_xml.py
Merge pull request #1348 from taldcroft/ascii/fix-ipac-include

Fix bug in IPAC reader when include/exclude_names set
Conflicts:

	astropy/io/ascii/ipac.py
Merge pull request #1153 from aconley/convolve_kernelnorm

Avoid modifying input arguments of astropy.nddata.convolve
Merge pull request #1229 from taldcroft/table/fix-masked-row

Table row access failure with masked tables
Merge pull request #1357 from hamogu/removeoldcompatstuff

Remove old compatibility tools from asciitable that are not needed in astropy
Conflicts:

	astropy/io/ascii/fixedwidth.py
Merge pull request #1381 from alexrudy/multiprocess-progressbar

Close Multiprocess progressbar Pool
Merge pull request #1377 from migueldvb/docs

Various documentation fixes
Merge pull request #1197 from embray/ez_setup

Simplify logic at the top of setup.py
Conflicts:

	setup.py
Merge pull request #1394 from astrofrog/wcs-improved-error-arguments

Improved error message for WCS when incorrect number of arguments is passed
Merge pull request #1403 from taldcroft/fix-1403

Fix problem adding a row to a table with object-type field(s)
Conflicts:

	astropy/table/table.py
	astropy/table/tests/test_table.py