Merge pull request #705 from astrofrog/docs/improve-quantity-docs

Improve documentation for Quantity
Conflicts:

	docs/units/index.rst
Merge pull request #712 from kbarbary/patch-1

Update codeguide to reflect config/utils/tools reorganization
Merge pull request #714 from astrofrog/setup/better-message-missing-cc-compiler

Add a more explicit message when the compiler set by CC cannot be found
Merge pull request #669 from astrofrog/unit/fix-float-conversion

Conceptual issue with float conversion when quantity is dimensionless
Merge pull request #718 from astrofrog/setup/fix-del-e

Fix to removing reference to caught exception
Merge pull request #720 from astrofrog/tests/add-test-keyword-names

Explicitly list keyword arguments when calling test()
Merge pull request #709 from mdboom/vo/python264-support

astropy.vo tests fail with current master on my system
Merge pull request #697 from mdboom/testing/open-files-testing-in-travis

Turn on open file testing in Travis
Conflicts:

	.travis.yml
Merge pull request #727 from astrofrog/utils/fix-data-path

Fix abspath -> realpath in utils.data to avoid issues with symlinks
Merge pull request #721 from nhmc/WhatsNew_Cosmology0.2

Update Cosmology section for What's New in 0.2
Made note of #717 in the known issues so that I can address it later
Merge branch 'v0.2.x' of github.com:astropy/astropy into v0.2.x