Refactored total_familiarit - faster AND one line!

Also removed average_familiarity too - not going there

Fixes #135 and #136