Reorder @webhat's PR, add Twitters, add edu icon

This finishes #607