merge compass and solr branches
add back in nfs