Update master-chef
Merge branch 'kitchenware'

Conflicts:
	cookbooks/node_logstash/attributes/default.rb
Change apache log format to be of the same format than nginx
Merge pull request #13 from ElPicador/master

Change apache log format to be of the same format than nginx