xvfb and browsers added for testing
Merge branch 'master' into elasticsearch

Conflicts:
	Berksfile
xvfb and browser recipes added
Merge branch 'master' into elasticsearch

Conflicts:
	chef.json