Final check of changes to raddick/SkyServer fork before deleting

I'm about to close down this fork and create a "raddick" branch instead. But I want to make sure we don't lose any changes I may have made in this fork. Could you please check and merge if needed? Then let me know and I'll create the branch and close the fork.