refactor a bit to allow multiple match_keys, add methods for getting grains and extractor mapping from fluff diffs
minor changes to build
pep8
process fluff diff
pep8
merge master
make setup use nose tests, use unittest2
fix travis testing
cleanup
Merge pull request #1 from dimagi/fluff_changes

Processing of fluff changes