ignoring virtualenv directory
Merge branch 'master' into implement_multiple_feeds
new fixture with migrated data