Output formatting changes.
Merge 'trimSlotFill' into rerank

Conflicts:
	slotfiller/src/main/scala/edu/knowitall/tac2013/findSlotFillersApp/KBPQueryExecutor.scala
	slotfiller/src/main/scala/edu/knowitall/tac2013/findSlotFillersApp/KbpQueryOutput.scala