Merge remote-tracking branch 'origin/trade-events-consolidated' into carlos/ustda-consolidated2

Conflicts:
	Gemfile
Initial steps for moving ustda to the consolidated trade events interface
ustda: Fix filtering by country
ustda: fix sorting specs for consolidated behavior
exim: fix importer always working on live data
exim: update specs to work on fixtures
exim: fix specs