Fixed bug with not recognizing City/Country semantic types in arg2terms, fixed bug in not adding terms in arg1terms and arg2terms to solr query string
Merge pull request #41 from rbart/fixhyphens

Fix extra spaces around hyphens (and other tokens)
Merge branch 'master' into newPatternStyle
Merge pull request #42 from jgilme1/newPatternStyle

New pattern style
Merge branch 'master' into formatting
Fix off-by-one error at end of offset intervals.