Added Ubuntu14.04 box and Puppe options
Added hiera data structure
Merge branch 'master' of https://github.com/example42/puppet-playground

Conflicts:
	Vagrantfile
	data/hostname/centos6.yaml
Some init scripts (still not used)