correct membership tense

Handle cases when we have a start and an end date to prevent things like
current memberships using 'will be a member of'

Fixes #663
This logic is getting quite complex! I wonder if it might be cleaner to move these conditionals into a helper method or something?