Editing
Merge branch 'master' of https://github.com/sleepinyourhat/vector-entailment

Conflicts:
	writing/AAAI SSS '15/methods.tex
Merge branch 'master' of https://github.com/sleepinyourhat/vector-entailment