tuneable storage-schemas/aggregation
delete fixed storage-schemas template
Fix missing database settings.
add cors support
Merge pull request #45 from josephholsten/cors

add cors support
Merge pull request #42 from eladroz/master

Tuneable, optional storage-schemas/aggregation templates
Merge pull request #43 from serialx/master

Django database settings missing
cleanup, jaime is now test-kitchen
Merge branch 'master' into federated

Conflicts:
	recipes/carbon.rb
	templates/default/storage-schemas.conf.erb