Eliminated subcycles and photons_per_cycle variable in favour if NPHOT
Removed variable j
Merge pull request #115 from jhmatthews/dev

Eliminate subcycles and photons_per_cycle variable in favour of NPHOT