update schedule
Merge branch 'master' into update_schedule

* master:
  follow Anne's style for consistency
lightning talks
update schedule
Merge pull request #93 from fox-squirrels-2013/update_schedule

Update schedule