Tinkered with format of show people page to make it look good.
Merge branch 'master' into production
No Merge Conflicts