bug fixes for logstash collection of http access, added json format to
log
Merge branch 'master' of github.com:zircote/zircote-ansible

Conflicts:
	vars/vagrant.yaml