Remove trailing whitespace
Remove unnecessary duplication

This check is already done in disqus_javascript.html
Override organisation people page for South Africa
Make organisation people extend from organisation base
Merge branch 'master' into issues/734-people-list-pages
Extract useful parts of position template into includes
Customise organisation people listing page
Add custom person listing
Make it clear that we're overriding templates for SA
Add filters and sorting to the org people template
Add override for search pagination
Remove sidebar and heading from organisation people page
Merge branch 'master' into issues/734-people-list-pages
Remove extra ul tags
Merge branch 'master' into issues/734-people-list-pages
added layout code to people list
added layout code
Make person profile smoke test less brittle

Because some countries don't have the same layout on the profile pages,
this test can break depending on the COUNTRY_APP setting. Although this
test is still slightly dependent, I think it's generally a more generic
test.
styled sidebar
renamed classes, moved markup inside if statements