rename npsm column to nprot and add new npsm and npep column; closes #33
Merge branch 'master' into matching