Added apache solr
miles vagrant
fix merge conflict
base settings for miles