Merge pull request #24 from ajstanley/modular

Enabled MADS by default
Merge branch 'modular' of github.com:discoverygarden/basic-solr-config into modular
added disambiguated name