Fix typo
Fix bug in pykronos client _get_errors
Add childlogdir to Jia supervisord.conf
Merge pull request #333 from Locu/fix-client

Fix bug in pykronos client _get_errors
Merge pull request #335 from Locu/jia-logging

Jia logging
Pluggable data sources for Metis. Fix #336.
Merge pull request #340 from Locu/metis-plugz

Pluggable data sources for Metis
Fix broken link
Avoid KeyError when value is an empty dictionary
Update to docs to removed unused parameter
Merge pull request #356 from joshblum/es-aliases

Avoid KeyError when value is an empty dictionary
Merge pull request #357 from joshblum/pykronos-docs

Update to docs to removed unused parameter
Data sources endpoint and tests for metis
Merge pull request #360 from Locu/metis-datasources

Data sources endpoint and tests for metis
Merge branch 'master' into jia-metis-update

Conflicts:
	metis/metis/core/query/kronos/adapters.py
	metis/metis/core/query/kronos/source.py
	metis/metis/views.py
	metis/tests/server.py
	metis/tests/test_convenience.py
	metis/tests/test_info_endpoints.py