working on new company/topic behavior
resolved merge conflict in claim.rb
lots of citation-related updates
touch-ups for deploying citation improvements
moved company-topics json into import dir
moved company-topics json into import dir
help text fix
moved company-topics code away
getting edit_article working on missing cards
fixed up article tip and analysis_name handling
Merge remote-tracking branch 'wagn/master'

Conflicts:
	mods/wikirate/sets/type/claim.rb
remove unused script
Merge remote-tracking branch 'wagn/master'