Merge pull request #1154 from stargaser/doc-workflow-inplace

Update development_workflow.rst to use --inplace instead of --inline
Merge pull request #1120 from hamogu/fix1120

Fix bug where Table.remove_column was converting a masked table to unmasked
Merge pull request #1163 from astrofrog/units-fix-decompose-array

Fix bug in Quantity._decompose()
Merge pull request #1168 from mdboom/coordinates/angle-parser-simple

Angle parser can't handle '1 degree' but can handle '1 degree 1 minute'
Merge pull request #1187 from hamogu/slice_masked

Fix bug: masked property lost when slicing a masked table
Conflicts:

	astropy/table/tests/test_item_access.py
Merge pull request #1194 from hamogu/fix1194

Remove reference to Table.mask in docs and remove code comment about adding mask arg
Merge pull request #1180 from mdboom/setup/upgrade-distribute-setup

Error: A 0.7-series setuptools cannot be installed with distribute
Merge pull request #1142 from hamogu/subclasstable

Make it easier to subclass Table
Conflicts:

	astropy/table/tests/test_item_access.py
Merge pull request #1213 from ehogan/fix-issue-696

Fix for issue #696
Merge pull request #1167 from hamogu/fix790

fixes a small bug that prevented changes in the comment symbol on writing
Merge pull request #1214 from terben/unit_dimensionless_branch

Fixed handling of dimensionless quantities in UnitBase/to_system - Issue #1150
Merge pull request #1223 from mdboom/votable/structure

Reading a VOTable with astropy does not get the table structure correct
Conflicts:

	astropy/io/votable/tests/vo_test.py
Merge pull request #1231 from mhvk/units-quantity-initialisation-speedup

In Quantity initialization, short-circuit one test for iterables for speed-up
Merge pull request #1225 from mdboom/misc/config-without-sphinx

Generate a config file if matplotlib is installed but not Sphinx
Merge pull request #1238 from iguananaut/test-h5py-version

Fix reporting of h5py version in the test runner
Merge pull request #582 from iguananaut/issue-582

LaTeX unicode support required for building docs
Conflicts:

	docs/development/docguide.rst
Merge pull request #1246 from cdeil/utils_data_docstring_fix

Fix examples in docstrings in utils.data
Merge pull request #1244 from iguananaut/issue-1244

Problems with logging in some systems
Merge pull request #1267 from barentsen/allow-logging-non-strings

Allow non-strings to be logged without raising a TypeError
Merge pull request #1198 from iguananaut/issue-1198

Make ``cython_version`` logic affiliated package-friendly