This is a change by NSH. encorporating j_direct and j_scatter
Corrected call to kappa_ind_comp to new format
Merge pull request #57 from jhmatthews/dev

Encorporation of j_direct and j_scatter as implemented by NSH