Makes search_buffer_size confiugrable
Merge pull request #1156 from lukecampbell/discovery

Discovery