included Bart's training extension for computing word embeddings
fix merge conflict, I hope
Nothing really
merged