Merge branch 'master' of github.com:tristaneuan/wikia-nlp into HEAD
revert CORENLP_PATH
change location of properties file to within this repo
Merge branch 'fix-corenlp-path'