PR: Rebase against master

This is a rebase against master, just to remind you about this.  I'll see if I can work out any bugs from the spectral_cube side.