Some changes relate to uwsgi support
Some more changes to provide correct uwsgi support
Merge remote-tracking branch 'upstream/master' into uwsgi_support

Conflicts:
	recipes/web.rb
Merge remote-tracking branch 'upstream/master' into uwsgi_support
Merge branch 'upstream/master' into uwsgi_support

Conflicts:
	attributes/default.rb
added carbon-aggregator support
added bats tests for carbon-aggregator
storage-aggregation.conf template moved to carbon-aggregator recipe
added aggregation-rules.conf file support
README: added aggregation_rules example
README: relay-rules example fixed/improved
tests: relay-rules.conf and aggregation-rules.conf content checking
Bring carbon upstart recipes into line for ea27d1a
Allow pulling AMQP password from encrypted data bag

Stored in the `amqp_password` key
Merge pull request #71 from onddo/carbon-aggregator

Add carbon-aggregator support
Merge pull request #73 from pdf/amqp_password_encrypted

Allow pulling AMQP password from encrypted data bag
Merge pull request #72 from pdf/upstart_fix

Bring carbon upstart recipes into line for ea27d1a
Merge branch 'upstream/master' into uwsgi_support

Conflicts:
	attributes/default.rb
	recipes/carbon_init.rb
Remove those uwsgi packages since we use pip for installation
Merge pull request #61 from gansbrest/uwsgi_support

Uwsgi support, so you are not limited to apache option