Add sample hiera configuration

Conflicts:
	config/hiera.yaml
Adds hiera support and elasticsearch to cloud-web
Add the deep_merge gem.
Older version of faraday for now.
Merge pull request #208 from articulate/add-hiera

Add hiera and make elasticsearch use 1.1.0