deleted conflicting import line
resolved merge conflict
ignore WikiaSolr/*
imports
moved nlp-config here
wrote entity overseer and harvester