collectd.conf example: mention new write_riemann options
collectd.confpod: mention 2 new options to tail plugin

... which were added in #673
Merge branch 'master' into debian
updating build.sh results
Merge branch "debian" into debian-wheezy-backports