add thoughtworks as bronze sponsor.
Merge remote-tracking branch 'rubyconf/master'
Add the sponsor info
remove whitespace of inline-blocked <li> for stopping the 3px gap bug.
Update the sponsor description for Groupon and BitFund.PE