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).