Added an expand prefix method to location name finder
Merge branch 'sportsClassification' into fullNameBugs
Added a conservative string search fall back for location strings
Merge branch 'master' into fullNameBugs

Conflicts:
	src/main/scala/edu/knowitall/tac2013/entitylinking/coref/CorefHelperMethods.scala
Edited the Location building code in the Stanford NER pipeline to handline locations separated by in
Added a resource with the location-in pattern
Added a function for sorting named entity mentions by distance from query offsets
Supplied an accronym inside parenthesis regex search pattern
Added code to not be so agressive with organization names that collide with locations
Merge pull request #34 from jgilme1/fullNameBugs

Full name bugs