Merge in TacKBP2014

There aren't too many changes between these branches. We should merge tac into master and leave the tac branch for posterity.