Merge pull request #596 from mdboom/vo/info-content

VOTable INFO element content not getting loaded
Merge pull request #585 from mdboom/wcs/relax_by_default

WCS: handle non-standard keywords by default
Merge pull request #593 from taldcroft/time-from-epoch

Fix failure to convert Time objects with format='unix' or 'cxcsec'
Merge pull request #608 from astrofrog/unit/allow-quantity-equivalencies

Added support for equivalencies in Quantity unit conversion
Merge pull request #607 from astrofrog/unit/quantity-to-array

Allow scalar and array Quantity objects to be converted to Numpy arrays
Merge pull request #612 from taldcroft/remove-ascii-version

Remove orphaned io/ascii/version.py file (remnant of asciitable)
Merge pull request #588 from kbarbary/fix-issue-575

Fix issue 575
Merge pull request #594 from iguananaut/issue-594

Fix logic for compiling from Cython files
Merge pull request #595 from iguananaut/issue-595

Possible bug in Sphinx?
Merge pull request #623 from astrofrog/fix-imports-python3.3

Fixed failures in Python 3.3 due to absolute imports
Merge pull request #624 from astrofrog/fix-warning-python3.3

Fix logger 'warn' to 'warning' since 'warn' was deprecated in Python 3.3
Merge pull request #603 from astrofrog/fix-constants-python3.3

astropy.constants doesn't import in python3.3
Merge pull request #616 from astrofrog/fix-setuptools

pip installation fails if distribute version is too old
Merge pull request #631 from eteq/fix-issue-631

Configuration file generation fails in Python 3.x
Merge pull request #587 from iguananaut/issue-587

Fix behavior for Unit multiplied/divided by a Quantity to match Quantity mul/div Unit
Merge pull request #634 from astrofrog/alternative-distribute-fix

Alternative fix to #630 - allow uses to specify whether to use existing distribute installation
Merge pull request #635 from astrofrog/fix-vanilla-setuptools-install

Attempt to fix Astropy installation with vanilla setuptools
Merge pull request #640 from iguananaut/use-distribute

An alternative to the fix in #634, #630, etc.
Merge pull request #629 from aconley/wmap9 (with manual merge)
Merge pull request #644 from astrofrog/unit/unary-operators-quantity

Added unary operators for Quantity