Increased NBFJUMPS and NBBJUMPS to 100 to accomodate more macro atom levels
Included steps to calculate IP in macro atom mode
Merge branch 'dev' of https://github.com/agnwinds/python into coll

merge ip changes (records IP in matom mode)
implemented collisional rates for n=2 subshells of He I, beta