Updated the 'Installing Astropy in develop mode' section (use setup.py develop in the first instance, added a link to the instructions on how to run the tests, which required adding a label to install.rst), added some additional links to GitHub pages, fixed some typos, applied other minor edits for clarity / consistency
Allow affiliated packages to generate their own cython_version.py module.
Per the comment in this commit, distribute_setup.py assumes that if you had to download distribute you did *not* already have the pkg_resources, which is a false assumption on Ubuntu. Make sure to pkg_resources is unloaded before importing the newly downloaded setuptools, because we want to use the pkg_resources that it ships with and not the one installed by the system.
Use .utils._compiler instead of astropy.utils._compiler to force affilated packages to report the compiler they were built with, not the compiler Astropy was built with.  This will require an update the package-template to include support for this optional feature.  The instructions for setting up the package should include removing this if the package does not include any compiled C extensions (in which case it's superfluous).
Provides a workaround for the OSX bug that causes #839
Simplified the branching logic a bit and added a changelog entry.  Also removed a Sphinx-specific directive from the changelog (just for now--I need to revist whether or not we want to be able to render the changelog without Sphinx).
Merge pull request #1198 from iguananaut/issue-1198

Make ``cython_version`` logic affiliated package-friendly
Add a troubleshooting tip about the Windows registry.  This is basically the same text I added to the PyFITS FAQ but s/PyFITS/Astropy
Merge pull request #1151 from iguananaut/issue-1151

Distribution instance has no attribute 'exclude_package_data'
Merge pull request #1252 from iguananaut/issue-1252

Document issue with binary installers on Windows 7
Merge pull request #839 from iguananaut/issue-839

Issue with astropy.io.fits and large arrays
Merge pull request #1212 from ehogan/dev-workflow-doc-improvements

Updated the 'Installing Astropy in develop mode' section ...
Added a note that setup.py develop won't work in Python 3 per #1126
Removed reference to 'forking action' as it was taken out of GitHub a while ago as well.