Must go into ruby block
Merge branch 'master' of github.com:averell23/graylog2

Conflicts:
	recipes/server.rb