added DebConf14
Merge remote-tracking branch 'refs/remotes/joeyh/master'
move to DebConf14 subdir
add MiniDebConf Cambridge 2014