Merge pull request #23 from GovWizely/calum/do-not-merge-uvl-entities

Merge UVL source entries based on name alone.
Updated source data file information.
Added --force-confnew to repair problem with travis elasticsearch installation.
Added --force-confnew to repair problem with travis elasticsearch installation.
Merge pull request #24 from GovWizely/calum/csl-plc-and-ssi-sources

CSL: PLC and SSI sources
Merge remote-tracking branch 'origin/trade-events-consolidated' into staging

Conflicts:
	spec/support/screening_lists_search_behavior.rb
Be explicit with superclass naming.