updated lucene options to check type, and gave it a type label
Merge branch 'master' of https://github.com/shilad/wikAPIdia into lucene
Update README.md

Updated to take in the addition of Env, and added PhraseLoader and LuceneLoader
Small modifications
Merge pull request #85 from shilad/lucene

Lucene
fixed typos
Merge branches 'master' and 'temp' of https://github.com/shilad/wikAPIdia into temp
that LuceneOptions change
Merge pull request #87 from shilad/temp

Small modifications
Flags had been changed for more consistent usage.
Merge branch 'master' of https://github.com/shilad/wikAPIdia into sr

Conflicts:
	wikAPIdia-loader/src/main/java/org/wikapidia/dao/load/ConceptLoader.java
	wikAPIdia-loader/src/main/java/org/wikapidia/dao/load/UniversalLinkLoader.java