Merge branch 'master' of https://github.com/shilad/wikapidia into category
PureWikidataConceptMapper draft completed
WikiTextDumpLoader - switching from files to lang codes
redirects now supports multiple langs!
Merge branch 'category' of https://github.com/shilad/wikapidia into category
Wikidata concept mapping improvements + convenience function for LanguageSet
Merge remote-tracking branch 'origin/master' into brent-branch
WikiTextDumpLoader - switched from files to lang codes
Added proper language handling to Concept and UniversalLinkLoaders
Also modified the casting because they getAnyRef method will return a List, not an array
reference.conf updated to default to Brent's list of 25 languages
these defaults are working correctly with RedirectLoader and WikiTextDumpLoader
Merge remote-tracking branch 'upstream/category' into category

Conflicts:
	wikapidia-loader/src/main/java/org/wikapidia/dao/load/RedirectLoader.java
	wikapidia-loader/src/main/java/org/wikapidia/dao/load/WikiTextDumpLoader.java
added @author to files I wrote
Merge remote-tracking branch 'origin/master'
...
Wikidata concept mapping improvements + convenience function for LanguageSet
Merge HEAD, branches 'category', 'download' and 'master' of https://github.com/shilad/wikapidia into brent-branch
modified ? : statements to use the getOptionValue(opt, defaultValue) method instead
modified ? : cmd statements to use the getOptionValue(opt, defaultValue) instead
Merge remote-tracking branch 'origin/category' into category
Merge pull request #58 from shilad/ari-branch

Final version of Category/Links