update status
fix email
Merge pull request #377 from timwata/2013-tokyo

Initial updates for Tokyo 2013