Update lib/carbon/filter.py

I'm guessing the "<<<<<<< HEAD" shouldn't be there.
defined metadata in rollup plugin
updated metric filtering for pipeline
oh yeah, no i remember - this is python\!
updated regex matching
filters were getting applied out-of-order
Merge pull request #3 from rowanu/graphite-megacarbon

Fix several problems with filters