Fixme
Merge branch 'master' of https://github.com/shilad/wikibrain into spatial
Merge branch 'master' of https://github.com/shilad/wikibrain into spatial
Minor spelling error
Merge branches 'master' and 'spatial' of https://github.com/shilad/wikibrain into spatial

Conflicts:
	wikibrain-spatial/src/main/java/org/wikibrain/spatial/loader/GADMConverter.java
Merge branch 'spatial' of https://github.com/shilad/wikibrain into spatial
Merge branch 'spatial' of https://github.com/shilad/wikibrain into spatial
Additional convenience functions +

Merge branches 'conceptualign' and 'master' of https://github.com/shilad/wikibrain into conceptualign

Conflicts:
	wikibrain-lucene/src/main/java/org/wikibrain/lucene/tokenizers/LanguageTokenizer.java
	wikibrain-wikidata/src/main/java/org/wikibrain/wikidata/WikidataDao.java