Update the Logstash package version and install the contrib pacakge as well.
Changed 'riemann' instances to 'logstash'.
Moved logstash.conf into the subdirectory it needs to be in for the Puppet file server to actually serve it.