Updated people pages to use their primary photo if it exists.
Switched order of awards and affiliations.
This is how it is on the current faculty profile page.
Using primary photo for person on department and group pages.
Adding borders to department logos.
Department gallery photos should be :small
Adding the elasticsearch reindex rake task from profile publisher
Fixed the bottom margin below the photo gallery.
Merge branch 'master' into profile_photos
Merge branch 'master' into profile_photos

Conflicts:
	lib/tasks/reindex_elasticsearch.rake
Merge pull request #43 from biola/profile_photos

Adding custom profile photo support