Parameterized rsyslog and logstash confs to send/recieve different logs over different ports so that separate parsing can be done without having to inspect the messages first.  Logstash has patterns file now.
Merge branch 'master' of git://github.com/ConsumerAffairs/salt-states into parsestash

Conflicts:
	etc/rsyslog.jinja
	logstash.sls