Final version presented in Paris.
Merge branch 'master' of github.com:stigrj/phd_talk