Merge branch 'modular' of github.com:discoverygarden/basic-solr-config into modular
added disambiguated name
fixed variable
Merge pull request #26 from ajstanley/modular

added disambiguated name