Formatting, file renaming for consistency, removal of old ch14 solr.xml
Merge branch 'master' of https://github.com/treygrainger/solr-in-action

Merge conflict