Merge pull request #1 from miekg/master

-03
change figure and text (issue #7)
Merge commit '6ac06d4'
remove quotes
Fix changelog
Fix date
We actually talk about opt-out
end-of-line whitespace
slightly better