Merge pull request #2828 from embray/misc/python3

Enable importing Astropy from a source checkout on Python 3
Merge pull request #2809 from mdboom/docs/other-parameters-section-formatting

"Other parameters" sections have weird formatting
Merge pull request #2826 from taldcroft/ascii-missing-docs

Rework / simplify doc section on Bad or Missing Values
Merge pull request #2829 from embray/testing/skip-unreliable-doctests

Skip a handful of doctests that
Merge pull request #2831 from astrofrog/fix-hdf5-dataset-auto

Automatically recognize h5py Dataset objects in Table.read
Merge pull request #2843 from embray/issue-2843

0.4.1: source tar contains a lot of precompiled files
Merge pull request #2844 from barentsen/patch-1

Small typo+grammar fix in docstring
Merge pull request #2851 from larrybradley/patch-1

Fix typo in construct_table.rst
Merge pull request #2819 from mwcraig/update-quant-unit-docs

Minor documentation change to clarify Numpy functions work well with Quantity, not Unit
Merge pull request #2800 from cdeil/package-template-docs

Add development/affiliated-packages.rst docs page
Merge pull request #2822 from pllim/conesearch-timeout-msg

Improved Cone Search time-out error message
Merge pull request #2853 from hamogu/template77

small addition to README instruction for affiliated packages
Merge pull request #2565 from cdeil/parallel_test_errors

Parallel testing fixes
Merge pull request #2858 from embray/fits/missing-test

Add missing test from PyFITS
Merge pull request #2867 from taldcroft/ascii-missing-docs-leftover

Add missing docs commit that was supposed to be in #2826 [skip ci]
Merge pull request #2872 from taldcroft/table-row

Move table.Row class into its own submodule table/row.py
Merge pull request #2878 from embray/issue-2878

Table.pprint() header ignores stdout redirection
Merge pull request #2879 from embray/table/reference-cycle

Fix reference cycle between Table and Column
Conflicts:

	CHANGES.rst
Merge pull request #2854 from embray/issue-2854

Astropy 0.4.1 on pypi is broken for python 2.6 due to missing _odict_py2 _fractions_py2 directories
Merge pull request #2900 from hamogu/fix2900

fitting with weights does not work
Conflicts:

	CHANGES.rst