Merge branch 'master' into gh-pages
Talk slides link
added link to video from talk about django-proxy-storage
Merge branch 'gh-pages'