Merge pull request #893 from keflavich/bug893_convfftnanfix

convolve_fft does not deal with infinity values
Merge pull request #928 from mdboom/vo/writing_table_without_mask

Table.write failing for VO table
Conflicts:

	astropy/io/votable/tests/table_test.py
Merge pull request #845 from mdboom/io/double-reading

Avoid downloading file twice when reading remote table with Table.read
Merge pull request #932 from mdboom/vo/pedantic-default-doc

Fix docs about pedantic in astropy.vo
Merge pull request #820 from iguananaut/issue-820

py3.3 doesn't download distribute correctly, fails build
Merge pull request #805 from kbarbary/docs-max-width

Change docs fixed width to a maximum width
Merge pull request #741 from iguananaut/issue-741

Try creating a binary Windows installer for Astropy
Merge pull request #927 from mdboom/vo/table_read_unnamed_tables

Make Table.read find VO tables with no names
Conflicts:

	astropy/io/votable/connect.py
	astropy/io/votable/tests/data/names.xml
	astropy/io/votable/tests/table_test.py