adjust URL patterns to accommodate non-ICPSR ids
Merge branch 'develop' into feature/geonames
include ddisearch.geo app in sphinx docs, as well as ddisearch.ddi.forms
unit test fixes based on changes to xml models