Run kibana at kibana user
docsim: convert pip.installed requirements.txt to cmd.run so highstate will run clean
nagios: Turn on notifications
nagios-nrpe: Install on roles:celery, move pillar data from lxc_hosts to nagios-nrpe
utils: Add man pages
consumeraffairs-dev-user: Add config line to keep local_settings from being overwritten for devs
ftp: send logs to syslog, add optional debug settings
added types to logstash outputs so other outputs don't get duplicated
filter changed for load-balancer web server checks
getting commented changes into VC to finish developing on mgmt.staging
early work on mysql error log parsing into logstash.  finishing dev on test server
/etc/hosts: sort entries by lxc_host name, then container name
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.

And then merged

Conflicts:

	etc/rsyslog.jinja
	logstash.sls
/etc/hosts: sort entries by lxc_host name, then container name
Merge branch 'parsestash'
Merge pull request #2 from knappador/master

Logstash filters for Nginx, MySQL error and slow logs, and parameterized management
use gunicorn instead of chaussette
turn off TCP segementation offloading on eth0
ignore mysql.events table in db backup script
Merge branch 'master' of github.com:ConsumerAffairs/salt-states