added DebConf14

git-annex branch available for merging