@cdeil - I issued a PR against your branch (cdeil/astropy#1) that will address this issue.  If you just merge that, it will appear automatically in this PR.