Merge branch 'master' of github.com:ExamTime/ey-cloud-recipes into issue-6384
Custom recipe for the sphinx search config Examtime/#6384
updated files
updated files
Updated directories and templates
Added feature to retrieve db password from config file
Renaming template file for sphinx.delta.conf (#6384)
Updated indexes directory. Automatically retrieval of db_name and db_user ExamTime/6384
Merge branch 'master' into issue-6384
Updated sphinx directory. Updated automatic db info retrieval ExamTime/6384
Disable regular sphinx recipe, as it is superceded by our own (#6384)
issue-6384
Merge branch 'issue-6384' of github.com:ExamTime/ey-cloud-recipes into issue-6384

Conflicts:
	cookbooks/sphinx_search/recipes/default.rb
Merge branch 'issue-6384' of github.com:ExamTime/ey-cloud-recipes into issue-6384
Updated files
Some tidy up of template files and naming (#6384)
Updated binlog directory ExamTime/6384
Just tidying up some whitespace (ExamTime/#6384)
Update recipe to look for 'util' instances (#6384)
Tweaks to recipe (ExamTime/#6384):

Remove 'development' prefix from log paths
Add hack to manually create /var/log/engineyard/sphinx/examtime