Merge pull request #21 from asgrim/master

I have merged this. We could also add Stuart's talk with the proposed title and change it if he come back with changes. I will put in a separate PR for that
Merge remote-tracking branch 'upstream/master'