Merge pull request #322 from adrianbanks/update-agenda-page

Update the agenda page
Merge pull request #323 from adrianbanks/update-sponsors-order

Update the order of the sponsors