Updated vagrant and puppet to 14.04
Update ubuntu box version in b script
Merge branch 'feature/Ubuntu_14.04' into develop

Conflicts:
	Vagrantfile
	puppet/manifests/nodes.pp