Re #236, make two keys optional depending on if we get them in the reply or not. Fixes current unit test for elasticsearch.
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Pep 8 fixes