Minor updates to schedule
Merge branch 'scaleconf2013' into gh-pages