Added ckanext-hierarchy.
Merge branch '2.0' of github.com:datagovuk/dgu-vagrant-puppet into 2.0

Conflicts:
	puppet/modules/dgu_ckan/manifests/init.pp
	puppet/modules/dgu_ckan/templates/ckan.ini.erb