add SInp described in Griffin et al. 2010
Merge branch 'master' into labelfree
adjust SIp calculation
add NASF described in Paoletti et al. 2006
Merge pull request #27 from sgibb/labelfree

add SIp and NSAF