Assorted additions
Merge branch 'master' of https://github.com/aczid/cloud_privacy

Conflicts:
	slides/slides.tex