Merge branch 'CLEF2014' of https://github.com/neds/expert-retrieval-translators into CLEF2014

Conflicts:
	.gitignore