Merge pull request #122 from metamx/config-master

Slightly better configuration when talking to indexing service