gistfile1.txt

$ git status
On branch v0.3.x
Your branch is up-to-date with 'origin/v0.3.x'.

You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

	new file:   .mailmap
	new file:   CONTRIBUTING.md
	modified:   MANIFEST.in
	modified:   astropy/config/tests/test_configs.py
	modified:   astropy/constants/tests/test_constant.py
	modified:   astropy/convolution/__init__.py
	modified:   astropy/convolution/convolve.py
	modified:   astropy/convolution/core.py
	modified:   astropy/convolution/kernels.py
	new file:   astropy/convolution/setup_package.py
	modified:   astropy/convolution/tests/test_convolve.py
	modified:   astropy/convolution/tests/test_convolve_fft.py
	modified:   astropy/convolution/tests/test_convolve_kernels.py
	modified:   astropy/convolution/tests/test_convolve_speeds.py
	modified:   astropy/convolution/tests/test_discretize.py
	modified:   astropy/convolution/tests/test_kernel_class.py
	modified:   astropy/convolution/utils.py
	modified:   astropy/coordinates/angle_utilities.py
	modified:   astropy/coordinates/distances.py
	modified:   astropy/coordinates/tests/accuracy/test_fk4_no_e_fk5.py
	modified:   astropy/coordinates/tests/accuracy/test_galactic_fk4.py
	modified:   astropy/coordinates/tests/test_api.py
	modified:   astropy/coordinates/tests/test_arrays.py
	modified:   astropy/coordinates/tests/test_name_resolve.py
	modified:   astropy/cosmology/__init__.py
	modified:   astropy/cosmology/core.py
	modified:   astropy/cosmology/parameters.py
	new file:   astropy/cosmology/setup_package.py
	modified:   astropy/cosmology/tests/test_cosmology.py
	modified:   astropy/extern/pytest.py
	modified:   astropy/extern/six.py
	modified:   astropy/io/ascii/__init__.py
	modified:   astropy/io/ascii/basic.py
	modified:   astropy/io/ascii/cds.py
	modified:   astropy/io/ascii/connect.py
	modified:   astropy/io/ascii/core.py
	modified:   astropy/io/ascii/daophot.py
	modified:   astropy/io/ascii/fixedwidth.py
	modified:   astropy/io/ascii/ipac.py
	modified:   astropy/io/ascii/setup_package.py
	modified:   astropy/io/ascii/sextractor.py
	new file:   astropy/io/ascii/tests/t/simple_csv.csv
	modified:   astropy/io/ascii/tests/test_connect.py
	modified:   astropy/io/ascii/tests/test_fixedwidth.py
	modified:   astropy/io/ascii/tests/test_ipac_definitions.py
	modified:   astropy/io/ascii/tests/test_types.py
	modified:   astropy/io/ascii/tests/test_write.py
	modified:   astropy/io/ascii/ui.py
	modified:   astropy/io/fits/column.py
	modified:   astropy/io/fits/convenience.py
	modified:   astropy/io/fits/file.py
	modified:   astropy/io/fits/fitsrec.py
	modified:   astropy/io/fits/hdu/base.py
	modified:   astropy/io/fits/hdu/hdulist.py
	modified:   astropy/io/fits/hdu/image.py
	modified:   astropy/io/fits/hdu/nonstandard.py
	modified:   astropy/io/fits/hdu/table.py
	modified:   astropy/io/fits/py3compat.py
	modified:   astropy/io/fits/setup_package.py
	modified:   astropy/io/fits/tests/__init__.py
	modified:   astropy/io/fits/tests/test_checksum.py
	modified:   astropy/io/fits/tests/test_core.py
	modified:   astropy/io/fits/tests/test_division.py
	modified:   astropy/io/fits/tests/test_header.py
	modified:   astropy/io/fits/tests/test_structured.py
	modified:   astropy/io/fits/tests/test_table.py
	modified:   astropy/io/fits/tests/util.py
	modified:   astropy/io/fits/util.py
	modified:   astropy/io/fits/verify.py
	modified:   astropy/io/misc/connect.py
	modified:   astropy/io/misc/hdf5.py
	modified:   astropy/io/misc/pickle_helpers.py
	modified:   astropy/io/misc/tests/test_hdf5.py
	modified:   astropy/io/misc/tests/test_pickle_helpers.py
	modified:   astropy/io/registry.py
	new file:   astropy/io/setup_package.py
	modified:   astropy/io/tests/test_registry.py
	modified:   astropy/io/votable/exceptions.py
	modified:   astropy/io/votable/tests/converter_test.py
	modified:   astropy/io/votable/tests/exception_test.py
	modified:   astropy/io/votable/tests/table_test.py
	modified:   astropy/io/votable/tests/ucd_test.py
	modified:   astropy/io/votable/tests/util_test.py
	modified:   astropy/io/votable/tests/vo_test.py
	modified:   astropy/logger.py
	modified:   astropy/modeling/models.py
	modified:   astropy/modeling/parameters.py
	modified:   astropy/modeling/polynomial.py
	modified:   astropy/modeling/powerlaws.py
	modified:   astropy/modeling/projections.py
	modified:   astropy/modeling/rotations.py
	modified:   astropy/modeling/setup_package.py
	modified:   astropy/modeling/tests/data/__init__.py
	modified:   astropy/modeling/tests/irafutil.py
	modified:   astropy/modeling/tests/test_constraints.py
	modified:   astropy/modeling/tests/test_fitters.py
	modified:   astropy/modeling/tests/test_functional_models.py
	modified:   astropy/modeling/tests/test_input.py
	modified:   astropy/modeling/tests/test_projections.py
	modified:   astropy/modeling/utils.py
	modified:   astropy/nddata/flag_collection.py
	modified:   astropy/nddata/nddata.py
	modified:   astropy/nddata/tests/test_flag_collection.py
	modified:   astropy/nddata/tests/test_nddata.py
	modified:   astropy/sphinx/ext/automodsumm.py
	new file:   astropy/sphinx/ext/changelog_links.py
	new file:   astropy/table/column.py
	modified:   astropy/table/np_utils.py
	new file:   astropy/table/tests/conftest.py
	modified:   astropy/table/tests/test_groups.py
	modified:   astropy/table/tests/test_init_table.py
	modified:   astropy/table/tests/test_item_access.py
	modified:   astropy/table/tests/test_masked.py
	modified:   astropy/table/tests/test_np_utils.py
	modified:   astropy/table/tests/test_operations.py
	modified:   astropy/table/tests/test_row.py
	modified:   astropy/tests/__init__.py
	new file:   astropy/tests/disable_internet.py
	modified:   astropy/tests/test_logger.py
	modified:   astropy/tests/tests/test_run_tests.py
	new file:   astropy/tests/tests/test_socketblocker.py
	modified:   astropy/time/erfa_time.pyx
	modified:   astropy/time/tests/test_quantity_interaction.py
	new file:   astropy/time/tests/test_sidereal.py
	modified:   astropy/units/equivalencies.py
	modified:   astropy/units/format/__init__.py
	new file:   astropy/units/format/ogip.py
	new file:   astropy/units/format/ogip_lextab.py
	new file:   astropy/units/format/ogip_parsetab.py
	modified:   astropy/units/si.py
	modified:   astropy/units/tests/test_equivalencies.py
	modified:   astropy/units/tests/test_format.py
	modified:   astropy/units/tests/test_physical.py
	modified:   astropy/units/tests/test_quantity_array_methods.py
	modified:   astropy/units/tests/test_quantity_ufuncs.py
	modified:   astropy/utils/compat/__init__.py
	new file:   astropy/utils/compat/numpycompat.py
	modified:   astropy/utils/data.py
	modified:   astropy/utils/tests/test_console.py
	modified:   astropy/utils/tests/test_data.py
	modified:   astropy/utils/tests/test_timer.py
	modified:   astropy/vo/__init__.py
	modified:   astropy/vo/client/async.py
	modified:   astropy/vo/client/conesearch.py
	modified:   astropy/vo/client/setup_package.py
	modified:   astropy/vo/client/tests/test_vo.py
	modified:   astropy/vo/client/vos_catalog.py
	new file:   astropy/vo/samp/__init__.py
	new file:   astropy/vo/samp/client.py
	new file:   astropy/vo/samp/constants.py
	new file:   astropy/vo/samp/data/astropy_icon.png
	new file:   astropy/vo/samp/data/clientaccesspolicy.xml
	new file:   astropy/vo/samp/data/crossdomain.xml
	new file:   astropy/vo/samp/errors.py
	new file:   astropy/vo/samp/hub.py
	new file:   astropy/vo/samp/hub_proxy.py
	new file:   astropy/vo/samp/hub_script.py
	new file:   astropy/vo/samp/integrated_client.py
	new file:   astropy/vo/samp/lockfile_helpers.py
	new file:   astropy/vo/samp/setup_package.py
	new file:   astropy/vo/samp/ssl_utils.py
	new file:   astropy/vo/samp/standard_profile.py
	new file:   astropy/vo/samp/tests/__init__.py
	new file:   astropy/vo/samp/tests/data/README.md
	new file:   astropy/vo/samp/tests/data/test1.crt
	new file:   astropy/vo/samp/tests/data/test1.key
	new file:   astropy/vo/samp/tests/data/test2.crt
	new file:   astropy/vo/samp/tests/data/test2.key
	new file:   astropy/vo/samp/tests/test_client.py
	new file:   astropy/vo/samp/tests/test_errors.py
	new file:   astropy/vo/samp/tests/test_helpers.py
	new file:   astropy/vo/samp/tests/test_hub.py
	new file:   astropy/vo/samp/tests/test_hub_proxy.py
	new file:   astropy/vo/samp/tests/test_hub_script.py
	new file:   astropy/vo/samp/tests/test_standard_profile.py
	new file:   astropy/vo/samp/tests/test_web_profile.py
	new file:   astropy/vo/samp/tests/web_profile_test_helpers.py
	new file:   astropy/vo/samp/utils.py
	new file:   astropy/vo/samp/web_profile.py
	modified:   astropy/vo/validator/inspect.py
	modified:   astropy/vo/validator/setup_package.py
	modified:   astropy/vo/validator/tests/data/printcat.out
	modified:   astropy/vo/validator/tests/test_validate.py
	modified:   astropy/vo/validator/tstquery.py
	modified:   astropy/vo/validator/validate.py
	modified:   astropy/wcs/docstrings.py
	modified:   astropy/wcs/setup_package.py
	modified:   astropy/wcs/src/wcslib_wrap.c
	new file:   astropy/wcs/tests/data/unit.hdr
	modified:   astropy/wcs/tests/test_pickle.py
	modified:   cextern/wcslib/C/GNUmakefile
	modified:   cextern/wcslib/C/cel.c
	modified:   cextern/wcslib/C/cel.h
	modified:   cextern/wcslib/C/fitshdr.h
	modified:   cextern/wcslib/C/fitshdr.l
	modified:   cextern/wcslib/C/flexed/fitshdr.c
	modified:   cextern/wcslib/C/flexed/wcsbth.c
	modified:   cextern/wcslib/C/flexed/wcspih.c
	modified:   cextern/wcslib/C/flexed/wcsulex.c
	modified:   cextern/wcslib/C/flexed/wcsutrn.c
	modified:   cextern/wcslib/C/getwcstab.c
	modified:   cextern/wcslib/C/getwcstab.h
	modified:   cextern/wcslib/C/lin.c
	modified:   cextern/wcslib/C/lin.h
	modified:   cextern/wcslib/C/log.c
	modified:   cextern/wcslib/C/log.h
	modified:   cextern/wcslib/C/prj.c
	modified:   cextern/wcslib/C/prj.h
	modified:   cextern/wcslib/C/spc.c
	modified:   cextern/wcslib/C/spc.h
	modified:   cextern/wcslib/C/sph.c
	modified:   cextern/wcslib/C/sph.h
	modified:   cextern/wcslib/C/spx.c
	modified:   cextern/wcslib/C/spx.h
	modified:   cextern/wcslib/C/tab.c
	modified:   cextern/wcslib/C/tab.h
	modified:   cextern/wcslib/C/wcs.c
	modified:   cextern/wcslib/C/wcs.h
	modified:   cextern/wcslib/C/wcsbth.l
	modified:   cextern/wcslib/C/wcserr.c
	modified:   cextern/wcslib/C/wcserr.h
	modified:   cextern/wcslib/C/wcsfix.c
	modified:   cextern/wcslib/C/wcsfix.h
	modified:   cextern/wcslib/C/wcshdr.c
	modified:   cextern/wcslib/C/wcshdr.h
	modified:   cextern/wcslib/C/wcslib.h
	modified:   cextern/wcslib/C/wcsmath.h
	modified:   cextern/wcslib/C/wcspih.l
	modified:   cextern/wcslib/C/wcsprintf.c
	modified:   cextern/wcslib/C/wcsprintf.h
	modified:   cextern/wcslib/C/wcstrig.c
	modified:   cextern/wcslib/C/wcstrig.h
	modified:   cextern/wcslib/C/wcsulex.l
	modified:   cextern/wcslib/C/wcsunits.c
	modified:   cextern/wcslib/C/wcsunits.h
	modified:   cextern/wcslib/C/wcsutil.c
	modified:   cextern/wcslib/C/wcsutil.h
	modified:   cextern/wcslib/C/wcsutrn.l
	modified:   cextern/wcslib/CHANGES
	modified:   cextern/wcslib/GNUmakefile
	modified:   cextern/wcslib/INSTALL
	modified:   cextern/wcslib/README
	modified:   cextern/wcslib/THANKS
	modified:   cextern/wcslib/VALIDATION
	modified:   cextern/wcslib/configure
	modified:   cextern/wcslib/configure.ac
	modified:   cextern/wcslib/flavours
	modified:   cextern/wcslib/makedefs.in
	modified:   cextern/wcslib/wcsconfig.h.in
	modified:   cextern/wcslib/wcsconfig_f77.h.in
	modified:   cextern/wcslib/wcsconfig_tests.h.in
	modified:   cextern/wcslib/wcsconfig_utils.h.in
	modified:   docs/conf.py
	modified:   docs/coordinates/index.rst
	modified:   docs/credits.rst
	modified:   docs/development/codeguide.rst
	modified:   docs/install.rst
	modified:   docs/io/ascii/extension_classes.rst
	modified:   docs/io/ascii/index.rst
	modified:   docs/io/ascii/read.rst
	modified:   docs/io/unified.rst
	modified:   docs/modeling/index.rst
	modified:   docs/modeling/new.rst
	modified:   docs/modeling/parameters.rst
	modified:   docs/stability.rst
	modified:   docs/table/access_table.rst
	modified:   docs/table/modify_table.rst
	modified:   docs/table/operations.rst
	modified:   docs/time/time_scale_conversion.odg
	modified:   docs/time/time_scale_conversion.png
	modified:   docs/units/format.rst
	modified:   docs/vo/index.rst
	new file:   docs/vo/samp/advanced_embed_samp_hub.rst
	new file:   docs/vo/samp/example_clients.rst
	new file:   docs/vo/samp/example_hub.rst
	new file:   docs/vo/samp/example_table_image.rst
	new file:   docs/vo/samp/index.rst
	new file:   docs/vo/samp/references.txt
	modified:   docs/vo/validator.rst
	new file:   scripts/samp_hub
	modified:   setup.cfg
	renamed:    .dmg_background.png -> static/dmg_background.png
	renamed:    .wininst_background.bmp -> static/wininst_background.bmp

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:      .travis.yml
	both modified:      CHANGES.rst
	both modified:      astropy/__init__.py
	both modified:      astropy/coordinates/angles.py
	both modified:      astropy/coordinates/tests/accuracy/test_fk4_no_e_fk4.py
	both modified:      astropy/coordinates/tests/test_angles.py
	both modified:      astropy/coordinates/tests/test_formatting.py
	both modified:      astropy/cosmology/funcs.py
	both modified:      astropy/io/ascii/latex.py
	both modified:      astropy/io/ascii/tests/test_read.py
	both modified:      astropy/io/fits/card.py
	both modified:      astropy/io/fits/connect.py
	both modified:      astropy/io/fits/diff.py
	both modified:      astropy/io/fits/hdu/compressed.py
	both modified:      astropy/io/fits/header.py
	both modified:      astropy/io/fits/tests/test_connect.py
	both modified:      astropy/modeling/core.py
	both modified:      astropy/modeling/fitting.py
	both modified:      astropy/modeling/functional_models.py
	both modified:      astropy/modeling/tests/example_models.py
	both added:         astropy/modeling/tests/test_core.py
	both modified:      astropy/modeling/tests/test_models.py
	both modified:      astropy/modeling/tests/test_parameters.py
	both added:         astropy/modeling/tests/test_polynomial.py
	both modified:      astropy/modeling/tests/test_rotations.py
	both modified:      astropy/sphinx/conf.py
	both modified:      astropy/sphinx/ext/automodapi.py
	both modified:      astropy/stats/funcs.py
	both modified:      astropy/table/__init__.py
	both modified:      astropy/table/pprint.py
	both modified:      astropy/table/table.py
	both modified:      astropy/table/tests/test_column.py
	both added:         astropy/table/tests/test_pickle.py
	both modified:      astropy/table/tests/test_pprint.py
	both modified:      astropy/table/tests/test_table.py
	both modified:      astropy/tests/helper.py
	both modified:      astropy/tests/pytest_plugins.py
	both modified:      astropy/time/core.py
	both modified:      astropy/time/tests/test_basic.py
	both modified:      astropy/time/tests/test_delta.py
	both modified:      astropy/time/tests/test_ut1.py
	both modified:      astropy/units/core.py
	both modified:      astropy/units/quantity.py
	both modified:      astropy/units/tests/test_quantity.py
	both modified:      astropy/units/tests/test_units.py
	both modified:      astropy/utils/timer.py
	both modified:      astropy/wcs/tests/data/nonstandard_units.hdr
	both modified:      astropy/wcs/tests/test_wcs.py
	both modified:      astropy/wcs/tests/test_wcsprm.py
	both modified:      astropy/wcs/wcs.py
	both modified:      docs/convolution/kernels.rst
	both modified:      docs/coordinates/angles.rst
	both modified:      docs/coordinates/distances.rst
	both modified:      docs/cosmology/index.rst
	both modified:      docs/development/testguide.rst
	both modified:      docs/time/index.rst
	both modified:      docs/units/conversion.rst
	both modified:      docs/units/equivalencies.rst
	both modified:      docs/units/index.rst
	both modified:      docs/units/quantity.rst
	both modified:      setup.py