switch to logstash-1.2.1 download /issue #184
ensure functional equivalency in logstash 1.2 /issue #184
refactor types into separate files
Merge branch 'master' into logstash-1.2

Conflicts:
	srv/logstash/Rakefile
	srv/logstash/config/common.conf.erb
further config updates for proposed cilabs logstash 1.2 usage /issue #184
only rewrite fields if using newer inputs
fix for messages which do not have a message field (e.g. wmi)
Merge branch 'logstash-1.2'