Dont deploy this until talks are final
Merge branch 'master' of https://github.com/PyConEs2014/PyConEs2014