Slightly rewrite helper to be easier to read
Extract helper
Put current position and roles in header block for member
Move the latest party into the header block
change wording for current member 'to' membership date

closes #366
Merge pull request #426 from openaustralia/current_member_wording

change wording for a current member's 'membership to' date
Merge branch 'test' into remove_stripes

Conflicts:
	spec/fixtures/static_pages/mp.php?mpn=Barnaby_Joyce&mpc=New_England&house=representatives.html
	spec/fixtures/static_pages/mp.php?mpn=Christine_Milne&mpc=Tasmania&house=senate.html
	spec/fixtures/static_pages/mp.php?mpn=Kevin_Rudd&mpc=Griffith&house=representatives.html
	spec/fixtures/static_pages/mp.php?mpn=Roger_Price&mpc=Chifley&house=representatives.html
	spec/fixtures/static_pages/mp.php?mpn=Tony_Abbott&mpc=Warringah&house=representatives.html