LCA 2011
Merge remote-tracking branch 'refs/remotes/Millak/synced/master'
README.md: Wording
add missing presentation for 30c3
add TrustyCon

from youtube via quvi, so the git-annex branch needs to be merged as well
recommend addurl --fast, and show a trick to avoid adding uuid to history