Renamed ClavinLocationResolver to Clavin.  Re-added LocationResolver and LuceneLocationResolver, marked them as Deprecated and modified LuceneLocationResolver so it is just a wrapper around Clavin with a LuceneGazetteer.