  from .vocab import Vocab
  from .lemmatizer import Lemmatizer
  from .pipeline import DependencyParser, Tensorizer, Tagger, EntityRecognizer
  from .pipeline import SimilarityHook, TextCategorizer, SentenceSegmenter
  from .pipeline import merge_noun_chunks, merge_entities
  from .compat import json_dumps, izip, basestring_
  from .gold import GoldParse
  from .scorer import Scorer
  from ._ml import link_vectors_to_models, create_default_optimizer
  from .attrs import IS_STOP
 
</s> remove from .attrs cimport attr_id_t, ID, NULL_ATTR
 </s> add  </s> remove 
 </s> add from .tokens.doc cimport Doc
from .tokens.doc cimport get_token_attr
from .attrs cimport ID, attr_id_t, NULL_ATTR </s> remove from .util import minibatch
 </s> add from .util import minibatch, itershuffle
from .compat import json_dumps
from .pipeline import merge_noun_chunks, merge_entities, merge_subtokens
  from .vocab import Vocab
  from .lemmatizer import Lemmatizer
  from .pipeline import DependencyParser, Tensorizer, Tagger, EntityRecognizer
  from .pipeline import SimilarityHook, TextCategorizer, SentenceSegmenter
from .pipeline import merge_noun_chunks, merge_entities, merge_subtokens
  from .compat import json_dumps, izip, basestring_
  from .gold import GoldParse
  from .scorer import Scorer
  from ._ml import link_vectors_to_models, create_default_optimizer
  from .attrs import IS_STOP
keep keep keep keep replace keep keep keep keep keep
 Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop"

This reverts commit c9ba3d3c2dc7067cf8bd55f878cec45a8c6d73d4, reversing
changes made to 92c26a35d425d4e8ca1b805ea776ea10f5ded3df. 
spacy/language.py