Bug fix in * import behavior.
Merge branch 'master' into query-sampler
Bug fixes and unit tests for `align_corpora`