Restroed people teaser.  #1636

Some changes were lost in the 3.3 merge.  Restroed.
More #1636 fixes.

Also found some errant dpms.
Merge branch 'SCHOLAR-3.3' of github.com:openscholar/openscholar into SCHOLAR-3.3

Conflicts:
	themes/hwpi_basetheme/template.php