Style consistency
JSON snake_case consistency
Merge branch 'master' of github.com:jamesaanderson/haystack