Adding Phil and Alvaro as speakers.
Merge branch 'master' into gh-pages