Merge pull request #939 from cdeil/make_kernel_airy

Fix call to scipy.special.j1 in make_kernel
Merge pull request #935 from mdboom/docs/fix-building-with-sphinx1.2b1

Docs won't build on Sphinx 1.2b1 due to WCSBase
Merge pull request #891 from eteq/fix-fk5-deepcopy

Add Time copy/deepcopy to fix bug in FK5Coordinates.separation
Merge pull request #959 from adrn/time-physical-type

Adds 'time' as a physical type in units
Merge pull request #970 from mdboom/vo/hide_decprecation_warning

Hide deprecation warning about io.votable.voexceptions in setup mode
Merge pull request #967 from taldcroft/docs/index-sections

Add sub-sections to main User Documentation section and increase visibility of unified I/O interface
Conflicts:

	docs/index.rst
Merge pull request #952 from mdboom/setup/error-message-encoding

Fix exception on Python 3 when displaying warning about configuration generation
Merge pull request #971 from iguananaut/issue-971

No handlers could be found for logger "root"
Merge pull request #974 from mdboom/unit/multiprocessing

units: don't play nice with multiprocessing
Merge pull request #1000 from mdboom/votable/info-under-table

io.votable: Fix dropping of INFO element inside TABLE element
Merge pull request #949 from mdboom/unit/string_quantities

units: Multiplying a string by a unit has strange behavior
Merge pull request #1004 from durga2112/patch-1

Update getting_started.rst
Merge pull request #986 from jdnc/bugfix-issue-977

Added fix to close #977
Conflicts:

	astropy/setup_helpers.py
Merge pull request #1003 from mdboom/misc/byteswap-bugs

Fix a number of byteswapping bugs
Merge pull request #1010 from mdboom/vo/mips-fixes

Testing failure on MIPS
Merge pull request #1028 from eteq/docs/timecore-to-time

change API documentation from time.core to just time
Merge pull request #1015 from mdboom/unit/speedup

Micro-optimizations to increase time to import units by 30%.
Merge pull request #1019 from ryanfox/table_row_assignment

Added assigning a row from another row. See issue #770
Conflicts:

	astropy/table/table.py
	astropy/table/tests/test_table.py
Merge pull request #992 from astrofrog/fix-pure-python-build-dir

Make pure-python affiliated packages separate Python 2 and Python 3 builds
Merge pull request #1047 from amiruna/placeholder

Fixed typo in docs/table/index.rst