Another round of edits
Merge branch 'master' of https://github.com/panjia1983/RSS2014booklet
Round 3 of edits, added workshop organizer names, tweaked template