fixed logstash/mgmt role
Merge branch 'master' into bebanjo

* master:
  fixed logstash/mgmt role
Merge branch 'master' into bebanjo

* master: (39 commits)
  add vexor/cloud role
  add prefix to vexor/worker variables
  Add back_office role
  Move database to separate role
  Revert "enable X-Accel-Redirect in nginx.conf"
  enable X-Accel-Redirect in nginx.conf
  update docker version
  update gitignore
  fixed vagrant
  downgrade kibana version
  fixed vagrant and vexor/mq
  update kibana version
  add ssl support to vexor/web
  update elasticsearh and logstash packages, fixes in web deploy
  create packer scripts for rackspace
  fixed travis build
  remove gitlab_url, github_restriction, airbrake_api_key, airbake_api_host unused variables
  remove hstore creation from vexor/web role
  fixed rackspace role
  update auto_scale
  ...

Conflicts:
	playbooks/group_vars/vexor.yml
	playbooks/roles/vexor/web/templates/deploy.j2
	playbooks/roles/vexor/worker/defaults/main.yml
	playbooks/roles/vexor/worker/tasks/main.yml
	playbooks/roles/vexor/worker/templates/deploy.rb
	playbooks/roles/vexor/worker/templates/env.j2
	playbooks/vexor.yml
Merge remote-tracking branch 'upstream/bebanjo' into bebanjo

* upstream/bebanjo:
  Merge branch 'master' into bebanjo
  fixed logstash/mgmt role

Conflicts:
	inventory/production.example
	playbooks/roles/vexor/web/templates/env.j2
	playbooks/roles/vexor/worker/tasks/main.yml
	playbooks/site.yml
	playbooks/vexor.yml