Merge pull request #753 from eteq/build-py-generate-config

Fix #719 by adding build_py config generation
Merge pull request #758 from eteq/coordinate-string-formatting-docs

Updated docs to including coordinate string formatting
Merge pull request #757 from mdboom/unit/hr_as_hour

Change/allow  hour unit to be 'hr'
Merge pull request #749 from mdboom/docs/credits

Update list of contributors in docs
Merge pull request #769 from iguananaut/issue-769

0.2b2 doesn't install on python 2.6
Merge pull request #745 from iguananaut/constants-refactor-rebase

Alternate constants API 2
Conflicts:

	astropy/units/format/generic.py