IDI-98: Small fix to workshops description.
IDI-102: Fix to the IDI mailing list signup.
IDI-102: Change to mailing list signup
Merge branch 'IDI-104'
IDI-113: Restore proper styling for grid of icons on research page
Merge branch 'IDI-113'
IDI-115: Add Geoffrey Shea to the People page. His research page will be added through the admin interface.
Merge branch 'IDI-115'
Merge branch 'IDI-115' into development
IDI-115: Add image for Shea
Merge branch 'IDI-115' into development
IDI-116 add manual block to retreive API 1.1 twitter feeds
IDI-116: update fluid twitter feed
IDI-116: Refactor twitter feed code to a single function, re-usable for all feeds
Merge branch 'IDI-116' into development

Conflicts:
	style.css