Add support for merging in matches from EDH
First commit of EDH merged matches
Merge branch 'edh' into edh-capgrids

Conflicts:
	create_pleiades_plus
	data/pleiades-plus.csv
	pleiades-plus.rb
Update capgrid log_match call
10/14/14 re-run of capgrids after edh merge