Changed a few things in intensity functions and SR matrix elements.  Removed some old code.