Paper: Minor modifications to the paper
Merge branch 'master' of github.com:marcgreen/p2pbackup

Conflicts:
	paper/paper.tex