Rename 'dsp' to 'sw' because we want to call the FPGA thing 'dsp'.
Merge branch 'master' into experimental