Moving everything to berks
Update to ubuntu 14.04
Merge branch 'master' into zbx

Conflicts:
	Cheffile
	Cheffile.lock
	Vagrantfile
Move site-cookbooks to cookbooks
Merge branch 'master' into zbx